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)
1  2 
source/blender/editors/gpencil/drawgpencil.c
source/blender/imbuf/intern/indexer.c

Simple merge