Tamito Kajiyama 5524ed9ba2 Merged changes in the trunk up to revision 55700. ...

Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h

2013-04-01 13:47:19 +00:00

..

blender

Merged changes in the trunk up to revision 55700.

2013-04-01 13:47:19 +00:00

blenderplayer

Merging r55547 through r55594 from trunk into soc-2008-mxcurioni

2013-03-26 09:09:31 +00:00

creator

Merged changes in the trunk up to revision 55700.

2013-04-01 13:47:19 +00:00

gameengine

style cleanup

2013-03-29 06:21:28 +00:00

icons

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

tests

code cleanup: incorrect sized array args, remove some redundant code.

2013-03-17 10:26:23 +00:00

CMakeLists.txt

…

SConscript

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00