Clean up merging conflict
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 3 Sep 2008 16:10:20 +0000 (16:10 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 3 Sep 2008 16:10:20 +0000 (16:10 +0000)
commit11ec880483db70f81c501b87f2b416412d33bb2e
tree20ea4dcfb19d3c6f9a1a94eb013fb9971a5729f9
parenta9ffeb8cada3f6e6a5dc4b89faaa5e477a178352
Clean up merging conflict
source/blender/makesdna/DNA_modifier_types.h