Arystanbek Dyussenov 58e44463fb Merge from trunk -r 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +00:00

..

blender

Merge from trunk -r 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +00:00

blenderplayer

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

creator

Merge from trunk -r 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +00:00

darwin

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

gameengine

Merge from trunk -r 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +00:00

icons

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

kernel

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

CMakeLists.txt

Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (svn status output: http://www.pasteall.org/7887).

2009-09-15 18:01:18 +00:00

Makefile

Merge from trunk -r 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +00:00

nan_compile.mk

Fixes to get Blender compile and run on PowerPC OSX 10.3, gcc 3.3

2009-10-20 15:51:18 +00:00

nan_definitions.mk

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

nan_link.mk

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

nan_subdirs.mk

Makefile updates for Blender 2.5 (from GSR)

2009-03-19 01:50:45 +00:00

nan_warn.mk

Update condition checks to match user definable CC and CCC.

2009-09-20 20:21:01 +00:00

SConscript

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00