Merge remote-tracking branch 'origin/5.5' 12/14912/1
Vincent COUVERT [Fri, 18 Jul 2014 15:20:58 +0000 (17:20 +0200)]
Conflicts:
scilab/modules/javasci/Makefile.in

Change-Id: I4e8a6cbbe895fbe582a2de5bf048623cd2e38445

1  2 
scilab/configure
scilab/configure.ac
scilab/modules/atoms/etc/repositories
scilab/modules/atoms/tests/unit_tests/repositories.orig
scilab/modules/javasci/Makefile.in

Simple merge
Simple merge
@@@ -1,1 -1,1 +1,1 @@@
- http://atoms.scilab.org/5.4
 -http://atoms.scilab.org/5.5
++http://atoms.scilab.org/5.6
@@@ -976,10 -976,10 +976,10 @@@ maintainer-clean-generic
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- @JAVASCI_FALSE@install-data-local:
 -@JAVASCI_FALSE@clean-local:
  @JAVASCI_FALSE@install-html-local:
 -@JAVASCI_FALSE@install-data-local:
 +@JAVASCI_FALSE@clean-local:
  @JAVASCI_FALSE@distclean-local:
++@JAVASCI_FALSE@install-data-local:
  clean: clean-am
  
  clean-am: clean-generic clean-libtool clean-local \