projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
756edb3
a2e1060
)
svn merge ^/trunk/blender -r42194:42197
author
Campbell Barton <ideasman42@gmail.com>
Sun, 27 Nov 2011 23:56:29 +0000
(23:56 +0000)
committer
Campbell Barton <ideasman42@gmail.com>
Sun, 27 Nov 2011 23:56:29 +0000
(23:56 +0000)
1
2
source/blender/blenkernel/intern/dynamicpaint.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/modifiers/intern/MOD_fluidsim_util.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/blenkernel/intern/dynamicpaint.c
Simple merge
diff --cc
source/blender/modifiers/intern/MOD_fluidsim_util.c
Simple merge
projects / blender-staging.git / commitdiff