Merging r57962 through r57988 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 4 Jul 2013 09:23:21 +0000 (09:23 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 4 Jul 2013 09:23:21 +0000 (09:23 +0000)
1  2 
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c

Simple merge