[Bf-blender-cvs] [3e59626] input_method_editor: Merge remote-tracking branch 'origin/master' into ime

Severin noreply at git.blender.org
Mon Nov 24 22:25:04 CET 2014


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

===================================================================



===================================================================






More information about the Bf-blender-cvs mailing list