cvs 'conflict indicators' removed (correct ones this time)
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6486 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
143e7f924f
commit
3000d9f51e
1 changed files with 1 additions and 3 deletions
|
|
@ -1,5 +1,5 @@
|
|||
Version 1.3.23 (in progress)
|
||||
----------------------------
|
||||
============================
|
||||
|
||||
10/22/2004: wsfulton
|
||||
[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
|
||||
to override the default ones.
|
||||
|
||||
|
||||
>>>>>>> 1.292
|
||||
09/10/2004: wsfulton
|
||||
Patch from Bill Clarke which fixes spurious preprocessor bug which
|
||||
shows on Solaris and gcc, eg:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue