Merge remote-tracking branch 'origin/master' into YaSp 67/16767/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 2 Jul 2015 14:45:26 +0000 (16:45 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 2 Jul 2015 14:45:26 +0000 (16:45 +0200)
commitede5811b643ae930333ba6ca6aa8f88ace871b9b
treefec1f3c8fb3711b087aaa01e82d51022fade0eda
parent002a6310109fd43c1e4ea93def006b76c302e1b9
parentee30ab0418209504ed35d360f9fc2606277837bd
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/graphics/src/c/getHandleProperty/get_mark_background_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_foreground_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_size_property.c

Change-Id: I3fc26719ceb1ac1671cb986b9a7bc10a853503e3
scilab/modules/graphics/src/c/getHandleProperty/get_mark_background_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_foreground_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_size_property.c