Merge remote-tracking branch 'origin/master' into YaSp 72/16772/1
Vincent COUVERT [Fri, 3 Jul 2015 08:35:44 +0000 (10:35 +0200)]
Change-Id: Iecc91599ef254f0bb07c98069640299ce7c650ac

1  2 
scilab/bin/scilab
scilab/modules/fileio/locales/fileio.pot
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/graphics_menubar.xml

Simple merge
Simple merge
Simple merge