Merge remote-tracking branch 'origin/5.5' 12/14912/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 18 Jul 2014 15:20:58 +0000 (17:20 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 18 Jul 2014 15:20:58 +0000 (17:20 +0200)
commit86427d492655e005c7b9cf98cf18cbe2ff863976
tree067e3fc84dd04f40aac8b057dbf68abd33912ac1
parent0f7e7dc855ce45c7b3dc6df12210049a66acf69b
parenta9b864d9103c582fa72d45c5f69a4dc04f74c975
Merge remote-tracking branch 'origin/5.5'

Conflicts:
scilab/modules/javasci/Makefile.in

Change-Id: I4e8a6cbbe895fbe582a2de5bf048623cd2e38445
scilab/configure
scilab/configure.ac
scilab/modules/atoms/etc/repositories
scilab/modules/atoms/tests/unit_tests/repositories.orig
scilab/modules/javasci/Makefile.in