diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-02-14 02:47:30 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-02-14 02:47:30 +0300 |
| commit | 3789c398ff2b2fd7f0eadba45686b0e235186f4a (patch) | |
| tree | afe1f241f03d17de7df10a414516f03c277518a1 /source/blender/makesdna/DNA_material_types.h | |
| parent | 5ed1597e2672cc0e59f8a1ca7c54ae3ad9206b8c (diff) | |
| parent | 4ca2905ead92f23b1aca7bdbcc23c605dd830a87 (diff) | |
Merged changes in the trunk up to revision 34828.
Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h
Diffstat (limited to 'source/blender/makesdna/DNA_material_types.h')
0 files changed, 0 insertions, 0 deletions