Tamito Kajiyama 94ae0232b0 Merged changes in the trunk up to revision 53729. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c

2013-01-12 02:02:53 +00:00

..

blender

Merged changes in the trunk up to revision 53729.

2013-01-12 02:02:53 +00:00

blenderplayer

Merged changes in the trunk up to revision 53584.

2013-01-05 22:24:05 +00:00

creator

Merged changes in the trunk up to revision 53729.

2013-01-12 02:02:53 +00:00

gameengine

code cleanup: warnings, also add check in crash handler that a wmWindowManager is present.

2013-01-11 03:21:24 +00:00

icons

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

tests

add ".hh" as an extension for source scripts.

2012-12-31 07:06:51 +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

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00