projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e197b99
049838f
)
svn merge ^/trunk/blender -r40311:40338
author
Campbell Barton <ideasman42@gmail.com>
Mon, 19 Sep 2011 05:58:52 +0000
(
05:58
+0000)
committer
Campbell Barton <ideasman42@gmail.com>
Mon, 19 Sep 2011 05:58:52 +0000
(
05:58
+0000)
1
2
source/blender/editors/sculpt_paint/paint_utils.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/editors/sculpt_paint/paint_utils.c
Simple merge