Commit: 3e5962656a3778a9d8e6eca02f11284636880633
Author: Severin
Date: Mon Nov 24 22:19:53 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rB3e5962656a3778a9d8e6eca02f11284636880633
Merge remote-tracking branch 'origin/master' into ime
Conflicts:
source/blender/editors/space_node/node_add.c
source/blender/editors/space_text/text_draw.c
source/blender/editors/space_view3d/view3d_edit.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
