Merge remote-tracking branch 'origin/master' into YaSp 59/16759/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 2 Jul 2015 09:21:32 +0000 (11:21 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 2 Jul 2015 09:21:32 +0000 (11:21 +0200)
commit9caa6adcd294b7f98cbf8996220a62ec84677d27
treef34025a50b84bc0d19551f40b68d0ec54112a5cf
parentd4672e1ac768b7e264c2fb082a238f298a3af648
parente0a914f1f42cc31b6c3495634817d7ada73bcc98
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_colors_property.c
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
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/set_colors_property.c

Change-Id: Ibfa0e2d39a96d7929c22a6354976e542fd955085
17 files changed:
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/sci_gateway/c/sci_name2rgb.c
scilab/modules/graphics/src/c/SetProperty.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_colors_property.c
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
scilab/modules/graphics/src/c/getHandleProperty/set_colors_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_mark_background_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_mark_foreground_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_mark_size_property.c
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/io/macros/%_save.sci
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java