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)
1  2 
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

Simple merge
Simple merge