blender/source
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
..
blender Merged changes in the trunk up to revision 43038. 2011-12-31 21:09:26 +00:00
blenderplayer Merged changes in the trunk up to revision 43038. 2011-12-31 21:09:26 +00:00
creator Merged changes in the trunk up to revision 43038. 2011-12-31 21:09:26 +00:00
darwin replace former applescript with an editable one 2011-10-19 19:15:35 +00:00
gameengine Changing KX_FontObject to look for a "Text" game property instead of a "text" property to match with bitmap font usage. 2011-12-31 09:37:19 +00:00
icons
tests patch [#29534] Change Matrix Representation and Access in Python to Conform with Standard Notation 2011-12-22 01:05:03 +00:00
CMakeLists.txt remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
SConscript