Merge remote-tracking branch 'remotes/origin/master' into uiwidget 06/13406/1
authorCalixte DENIZET <calixte.denizet@scilab-enterprises.com>
Tue, 7 Jan 2014 10:15:24 +0000 (11:15 +0100)
committerCalixte DENIZET <calixte.denizet@scilab-enterprises.com>
Tue, 7 Jan 2014 10:15:43 +0000 (11:15 +0100)
commite34ecb9cf322e87720d4eeb53b904f6c41af5c99
tree8a069247d104b5f836ebca5ffa5f054a80e10da2
parentf89735c155d20fff52ade9ad812f1360ec580aae
parent74c010b8fdebb609a9807d44ba7a7dad4203e32e
Merge remote-tracking branch 'remotes/origin/master' into uiwidget

Change-Id: Ic75ad01dc38ad7c04800bc878bd3b85b819bbd3c
scilab/CHANGES_5.5.X