Merge branch 'gsoc2012-scilab' of https://github.com/smarchetto/swig into gsoc2012-scilab
Conflicts: Examples/Makefile.in Source/Modules/scilab.cxx configure.ac
This commit is contained in:
commit
0980ff901f
Conflicts: Examples/Makefile.in Source/Modules/scilab.cxx configure.ac