Merge remote-tracking branch 'origin/master' into uiwidget 45/13345/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Mon, 9 Dec 2013 13:46:22 +0000 (14:46 +0100)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Mon, 9 Dec 2013 13:46:22 +0000 (14:46 +0100)
commit00326c039e6504eeb7392f0aad37e3337d66085a
tree96ace40b01c6d0d9009975405247598045a5233d
parent31bbd693a5ad4b0ec4a0f742d0d703ebec4dccea
parentbeb7bc3a8bfa9d008dceb424f60b4d226d9e8500
Merge remote-tracking branch 'origin/master' into uiwidget

Conflicts:
scilab/modules/gui/Makefile.in
scilab/modules/types/Makefile.in

Change-Id: Ia4a044381911a70dcfdd34ecf8e92fa2649aa8cb
scilab/CHANGES_5.5.X
scilab/aclocal.m4
scilab/configure
scilab/configure.ac
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/gui/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/types/Makefile.in