Merge remote-tracking branch 'origin/master' into light_property 57/12657/1
Antoine ELIAS [Wed, 25 Sep 2013 10:46:38 +0000 (12:46 +0200)]
Change-Id: I1bccc62d48aa359d3ba56ef6ecc3cc67423f831a

1  2 
scilab/CHANGES_5.5.X
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicModel/GraphicModel.java
scilab/modules/graphics/src/c/getHandleProperty/get_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_type_property.c
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/G2DDrawingTools.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/motor/DrawTools.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Motor3D.java

Simple merge
@@@ -28,10 -27,8 +27,9 @@@ import org.scilab.forge.scirenderer.tra
  import org.scilab.forge.scirenderer.tranformations.Vector3d;
  
  import org.scilab.forge.scirenderer.implementation.g2d.G2DCanvas;
- import org.scilab.forge.scirenderer.implementation.g2d.G2DCanvasFactory;
  import org.scilab.forge.scirenderer.implementation.g2d.clipping.G2DClippingManager;
  import org.scilab.forge.scirenderer.implementation.g2d.motor.Motor3D;
 +import org.scilab.forge.scirenderer.implementation.g2d.lighting.G2DLightManager;
  
  /**
   *