diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2011-09-09 16:37:56 +0400 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2011-09-09 16:37:56 +0400 |
commit | ca170a8ed6745da4f9de5d2f5a1544571a2df783 (patch) | |
tree | a16451e526b419341f30c5322658d41df9c50be6 /source/blender/makesrna/intern/rna_rna.c | |
parent | c1c4743696c67f562eda31e90d03c72eaec04567 (diff) |
forgot to resolve one conflict in previous merge
Diffstat (limited to 'source/blender/makesrna/intern/rna_rna.c')
0 files changed, 0 insertions, 0 deletions