jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10238 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2008-02-09 12:27:22 +00:00
commit fa03e21139
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.current
View file

@ -1,7 +1,6 @@
Version 1.3.34 (in progress) Version 1.3.34 (in progress)
============================ ============================
<<<<<<< .mine
02/09/2007: wsfulton 02/09/2007: wsfulton
[Python] Experimental shared_ptr typemaps added. Usage is the same as the recently [Python] Experimental shared_ptr typemaps added. Usage is the same as the recently
added Java and C# shared_ptr typemaps. Two macros are available, although these added Java and C# shared_ptr typemaps. Two macros are available, although these
@ -78,11 +77,9 @@ Version 1.3.34 (in progress)
%feature("smartptr") "foo::bar" %feature("smartptr") "foo::bar"
=======
02/01/2008: olly 02/01/2008: olly
[Python] Fix format string bug (SF#1882220). [Python] Fix format string bug (SF#1882220).
>>>>>>> .r10235
01/31/2008: wsfulton 01/31/2008: wsfulton
Additions to the %types directive. Now the conversion / casting code can be Additions to the %types directive. Now the conversion / casting code can be
overridden to some custom code in the %types directive, like so: overridden to some custom code in the %types directive, like so: