diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-07-20 00:52:33 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-07-20 00:52:33 +0400 |
| commit | bf22acbaffd755a5b9eecd9e4c265fff8307f447 (patch) | |
| tree | 877cc4343e5ce264bd67955261dedc16ce6fe161 /source/blender/modifiers/intern | |
| parent | 7b480e34fd2b5d2df731d7b5f1afe0e57d597607 (diff) | |
| parent | 5505697ac508c02b8a2e196c5a8c07431bc687cf (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30324:30325
Nasty merge conflicts in editors/sculpt_paint, probably made some mistakes. Will finish merging to latest trunk before fixing bugs though.
Diffstat (limited to 'source/blender/modifiers/intern')
0 files changed, 0 insertions, 0 deletions