Merge remote-tracking branch 'origin/YaSp' into richelieu-vmkit
authorPeter Senna Tschudin <peter.senna@gmail.com>
Fri, 24 May 2013 08:06:45 +0000 (10:06 +0200)
committerPeter Senna Tschudin <peter.senna@gmail.com>
Fri, 24 May 2013 08:06:45 +0000 (10:06 +0200)
commit8b2cae8c402d0b4206b11ca1c2a0dfff09b1fc99
treea2371371a8f1e1b234301ea8378b52c9796b6dd6
parent96894aef35b8471579005adb171d1bdf936b174d
parent13df03ce372c7032dfa7223c0cfafe277c55912e
Merge remote-tracking branch 'origin/YaSp' into richelieu-vmkit

Conflicts:
scilab/configure
scilab/aclocal.m4
scilab/configure
scilab/configure.ac
scilab/modules/api_scilab/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/core/includes/machine.h.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/system_env/Makefile.in
scilab/modules/types/Makefile.in