Mergin trunk into soc-2011-tomato up to rev 50188
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 24 Aug 2012 14:11:04 +0000 (14:11 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 24 Aug 2012 14:11:04 +0000 (14:11 +0000)
All reverted commits should be merged again.

--
svn merge -r50173:50188 ^/trunk/blender

1  2 
source/blender/makesrna/intern/rna_nodetree.c
source/blender/windowmanager/intern/wm_window.c