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

Tamito Kajiyama 55015daa43 Merged changes in the trunk up to revision 51448. ...

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesrna/intern/rna_main_api.c

2012-10-20 16:48:48 +00:00

..

blender

Merged changes in the trunk up to revision 51448.

2012-10-20 16:48:48 +00:00

blenderplayer

Merged changes in the trunk up to revision 51448.

2012-10-20 16:48:48 +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

code cleanup:

2012-10-17 04:13:03 +00:00

icons

…

tests

style cleanup: pep8

2012-10-08 10:03: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