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

cvs 'conflict indicators' removed (correct ones this time)

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6486 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2004-10-22 21:22:00 +00:00
commit 8ad2d4c7d3
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SWIG/CHANGES.current
View file

@ -1,5 +1,5 @@
Version 1.3.23 (in progress) Version 1.3.23 (in progress)
---------------------------- ============================
10/22/2004: wsfulton 10/22/2004: wsfulton
[Java] Patch #1049496 from Scott Michel fixes directors methods with [Java] Patch #1049496 from Scott Michel fixes directors methods with
@ -839,8 +839,6 @@ Version 1.3.23 (in progress)
- Add pyfragments.swg, now the user can add fragments - Add pyfragments.swg, now the user can add fragments
to override the default ones. to override the default ones.
>>>>>>> 1.292
09/10/2004: wsfulton 09/10/2004: wsfulton
Patch from Bill Clarke which fixes spurious preprocessor bug which Patch from Bill Clarke which fixes spurious preprocessor bug which
shows on Solaris and gcc, eg: shows on Solaris and gcc, eg: