Tamito Kajiyama cdbfd1db38 Merged changes in the trunk up to revision 45820. ...

Conflicts resolved:
source/creator/creator.c

2012-04-21 00:33:36 +00:00

..

blender

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

blenderplayer

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

creator

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

darwin

replace former applescript with an editable one

2011-10-19 19:15:35 +00:00

gameengine

Fix #31016: rigid body joint constraint in game engine did not respect constraint

2012-04-19 15:14:28 +00:00

icons

…

tests

spelling cleanup

2012-03-18 07:38: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

…