Tamito Kajiyama e91f33101f Merged changes in the trunk up to revision 50956. ...

Conflicts resolved:
source/blender/editors/interface/resources.c

2012-09-30 13:16:55 +00:00

..

blender

Merged changes in the trunk up to revision 50956.

2012-09-30 13:16:55 +00:00

blenderplayer

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

creator

Merged changes in the trunk up to revision 50956.

2012-09-30 13:16:55 +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

incorrect spelling in comments

2012-09-26 20:05:38 +00:00

icons

…

tests

pep8 cleanup

2012-09-26 21:19:51 +00:00

CMakeLists.txt

…

SConscript

Scons:

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