Merge remote-tracking branch 'origin/master' into vs2012 71/12271/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Tue, 13 Aug 2013 14:44:53 +0000 (16:44 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Tue, 13 Aug 2013 14:45:17 +0000 (16:45 +0200)
commit9b746b3e06f7fd5a66fc42135250dd26c2a9174e
tree0a94b55a375fc0332ba36f2d549cb8ff9d835b83
parentd711f6707935fe0dd02b0ebbf7f3abeb9ddc178d
parentd2a6e24a5e30827002a0d3162bd2f1411c73cd09
Merge remote-tracking branch 'origin/master' into vs2012

Change-Id: I4dda553aec37507431116f8ae8625f23664d8a3e
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphics/graphics.vcxproj