Merge remote-tracking branch 'origin/5.4' 91/9591/1
Sylvestre Ledru [Mon, 5 Nov 2012 16:57:30 +0000 (17:57 +0100)]
Change-Id: I01946786a9548eef9eb69c1bf715965aaebd7c62

1  2 
scilab/Makefile.am
scilab/Makefile.in
scilab/configure
scilab/configure.ac
scilab/modules/api_scilab/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/special_functions/Makefile.in

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge