This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Tamito Kajiyama cc3adc2202 Merged changes in the trunk up to revision 43038. ...

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c

2011-12-31 21:09:26 +00:00

1.6 KiB

Raw Blame History

View Raw