forgot to resolve one conflict in previous merge
authorBenoit Bolsee <benoit.bolsee@online.be>
Fri, 9 Sep 2011 12:37:56 +0000 (12:37 +0000)
committerBenoit Bolsee <benoit.bolsee@online.be>
Fri, 9 Sep 2011 12:37:56 +0000 (12:37 +0000)
commitca170a8ed6745da4f9de5d2f5a1544571a2df783
treea16451e526b419341f30c5322658d41df9c50be6
parentc1c4743696c67f562eda31e90d03c72eaec04567
forgot to resolve one conflict in previous merge
source/blender/makesrna/intern/rna_modifier.c