Merge remote-tracking branch 'origin/5.5' 58/14858/1
Vincent COUVERT [Fri, 11 Jul 2014 15:11:17 +0000 (17:11 +0200)]
Conflicts:
scilab/configure

Change-Id: I6cd23891c2e2c317ff5d8efb7146893e841814b4

1  2 
scilab/configure
scilab/configure.ac
scilab/modules/javasci/Makefile.in

Simple merge
Simple merge
@@@ -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@distclean-local:
  @JAVASCI_FALSE@install-data-local:
- @JAVASCI_FALSE@clean-local:
  @JAVASCI_FALSE@install-html-local:
+ @JAVASCI_FALSE@clean-local:
 +@JAVASCI_FALSE@distclean-local:
  clean: clean-am
  
  clean-am: clean-generic clean-libtool clean-local \