diff options
| author | Roland Hess <me@harkyman.com> | 2009-01-07 16:10:31 +0300 |
|---|---|---|
| committer | Roland Hess <me@harkyman.com> | 2009-01-07 16:10:31 +0300 |
| commit | 1ff595a28e541de9cf71708bb7327b8deb0598ac (patch) | |
| tree | 5e8879f272e428991da735349eb79d9d40196e65 /source/blender/blenkernel/BKE_modifier.h | |
| parent | 5ef7b1f76ffc8796b2e5ae58a62fcb451229108b (diff) | |
Conflicts resolved. Hadn't used the Resolve command last time. Brilliant.
Diffstat (limited to 'source/blender/blenkernel/BKE_modifier.h')
0 files changed, 0 insertions, 0 deletions