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)
commit206d7958f30389bcc55a0ef242de90dda73a7cf9
tree9276dbf70d050689008c8fa61750cb436b8117e0
parent54c64cb443bd1ce452b3d9a5738a7aca8dc952a1
parent1a2d0d84dab40176ca8a390a2986f3f3fed01d78
Mergin trunk into soc-2011-tomato up to rev 50188

All reverted commits should be merged again.

--
svn merge -r50173:50188 ^/trunk/blender
source/blender/makesrna/intern/rna_nodetree.c
source/blender/windowmanager/intern/wm_window.c