Merging r49105 through r49107 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 21 Jul 2012 19:21:12 +0000 (19:21 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 21 Jul 2012 19:21:12 +0000 (19:21 +0000)
commit130b6bad4eea28b2906cc90cdb909c0b3a331f6a
treecbf4ebf0d7f1b245893406e9ca019f169c407e7f
parent7baf3d2ececce768fd36704cc16c5617c1a74f09
parent049dd8a0ffa94b0d02033877ec99172659b89d8c
Merging r49105 through r49107 from trunk into soc-2011-tomato
source/blender/editors/interface/resources.c