Merge remote-tracking branch 'origin/master' into YaSp 61/16761/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 2 Jul 2015 09:34:25 +0000 (11:34 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 2 Jul 2015 09:34:25 +0000 (11:34 +0200)
commit1521067587ed28479bf9ba284e09f396668431b7
treefb2a4a8310476e865eb7c54c0225c4d060babaec
parent9caa6adcd294b7f98cbf8996220a62ec84677d27
parentc62e1fddc6f0f2e48b190389102b3c9fb946376c
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: I04943f088b436f2a642a7164e361f92021e1d528
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