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

Remove accidentally committed conflict marker.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11198 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2009-04-30 00:13:14 +00:00
commit 81f2687f60
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.current
View file

@ -15,7 +15,6 @@ Version 1.3.40 (in progress)
run a little faster (in tests with Xapian on x86-64 Ubuntu 9.04,
the stripped wrapper library was 11% smaller and ran 2.7% faster).
>>>>>>> .r11195
2009-04-21: wsfulton
[C#] Fix #2753469 - bool &OUTPUT and bool *OUTPUT typemaps initialisation.