Fix some compilation issues due to the various conflicts
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 27 Sep 2013 15:09:59 +0000 (17:09 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 27 Sep 2013 15:09:59 +0000 (17:09 +0200)
commit59c7a66ece30f0d99931c3f506126c0d8aeb7538
tree995321e5f2792bf02d1adf5138e9f89d3ea81210
parentd68d561d9e3cb69030bb817a0ba1f552eb2c9643
Fix some compilation issues due to the various conflicts

Change-Id: I48ef1654bc31c4395f78cb1b2c1b83a35f07f5a5
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/src/cpp/InitScilab.cpp
scilab/modules/core/src/cpp/tasks.cpp