svn merge ^/trunk/blender -r49256:49260
authorCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2012 17:15:28 +0000 (17:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2012 17:15:28 +0000 (17:15 +0000)
commitae5fc40a63a19f7e5d72da5caf7579548911f791
tree27862ee5feb4ec74c0b549cc48b9d6d7b41100aa
parent9325546c1120d4a96db459c02a8f0ae1a53bf4ab
parent7f1a76887f975e4385684241d5be4cffa297afb0
svn merge ^/trunk/blender -r49256:49260
source/blender/windowmanager/intern/wm_init_exit.c