Tamito Kajiyama 4172997675 Merged changes in the trunk up to revision 50607. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2012-09-15 00:15:24 +00:00

..

blender

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

blenderplayer

Merged changes in the trunk up to revision 50257.

2012-08-29 00:53:29 +00:00

creator

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

darwin

initial retina support for osx \ to take effect you must perhaps logout/in \i prefer in terminal: /System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -v -f

2012-09-07 15:44:20 +00:00

gameengine

bge cleanup caught by accident while going over the code, it seems someone forgot to use rect_height everywhere (no functional change)

2012-09-13 23:39:09 +00:00

icons

…

tests

modifications needed to get a URL from an RNA id from the testing script

2012-09-13 00:26:01 +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

Scons:

2012-06-30 22:44:36 +00:00