Campbell Barton da8a7928c9 svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

..

BlenderRoutines

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

Converter

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

Expressions

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

GameLogic

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

GamePlayer

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

Ketsji

svn merge ^/trunk/blender -r41227:41230 . --accept=theirs-full

2011-10-24 22:18:32 +00:00

Network

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

Physics

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

PyDoc

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

Rasterizer

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

SceneGraph

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

VideoTexture

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +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

enable building the game engine without bullet for scons & cmake

2010-10-10 07:01:56 +00:00