Merge branch 'master' into 26_07_enable_creatin_scaled_unit_with_other_scaled_units

Author: fredroy

constants/__init__.py

@@ -38,8 +38,8 @@
 
 
         class KeyPressedController(Sofa.Core.Controller):
-            #This controller monitors key movements.
-            #    Press ctrl and a key to test it!
+            #  This controller monitors key movements.
+            #  Press CTRL + SHIFT + a key to test it!
 
             def __init__(self, *args, **kwargs):
                 Sofa.Core.Controller.__init__(self, *args, **kwargs)

examples/keyEvents.py

@@ -29,7 +29,7 @@
 
 class KeyPressedController(Sofa.Core.Controller):
     """ This controller monitors key movements.
-	Press ctrl and a key to test it!
+    Press CTRL + SHIFT + a key to test it!
     """
     def __init__(self, *args, **kwargs):
         Sofa.Core.Controller.__init__(self, *args, **kwargs)