Merging r40960 through r40989 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 13 Oct 2011 17:44:59 +0000 (17:44 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 13 Oct 2011 17:44:59 +0000 (17:44 +0000)
commit1d27e1c849f5198b18984cfc1bdc9562ec2f9c33
tree5d2c9c4eca551d2e1f7500d8dc49cfbed3f72367
parent86a05a71aa4b7e8255dc4aff32c73bd6641cce87
parent818c098004ff64adcc0ff24fe29d40850f5591ce
Merging r40960 through r40989 from trunk into soc-2011-tomato
source/blender/editors/gpencil/drawgpencil.c
source/blender/imbuf/intern/indexer.c