svn merge -r 31314:31370 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorJoerg Mueller <nexyon@gmail.com>
Mon, 16 Aug 2010 09:37:08 +0000 (09:37 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Mon, 16 Aug 2010 09:37:08 +0000 (09:37 +0000)
commit2b7a774ab0dfd3bc66240b387a586b5122ab2661
tree11b863eb5c0a138dbfbc8b65d42d2724ddc80946
parent02314f11d83f4ee7e0b2d3f052d36ac492cfc910
parenta91d538f47171a40463016b91c22d39d694d923a
svn merge -r 31314:31370 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_logic/logic_window.c
source/blender/python/generic/blf_api.c
source/blender/python/intern/bpy.c
source/blender/windowmanager/WM_api.h