Joshua Leung 37f47ef386 NLA SoC: Merge from 2.5 20441 to 20570 (HEAD) ...

There were a few conflicts/missing files. Hopefully everything updated ok...

2009-06-02 01:40:53 +00:00

..

blender

NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)

2009-06-02 01:40:53 +00:00

creator

Big, big commit!!

2009-05-05 23:10:32 +00:00

darwin

* Updated the Mac OS X blender and .blend file icons to support

2009-05-21 13:39:47 +00:00

gameengine

2.5

2009-05-16 13:56:40 +00:00

icons

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

kernel

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317

2009-03-17 21:44:58 +00:00

CMakeLists.txt

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

Makefile

2.5

2009-06-01 12:10:30 +00:00

nan_compile.mk

2.5

2009-06-01 12:10:30 +00:00

nan_definitions.mk

Big, big commit!!

2009-05-05 23:10:32 +00:00

nan_link.mk

Makefile updates for Blender 2.5 (from GSR)

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

nan_subdirs.mk

Makefile updates for Blender 2.5 (from GSR)

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

nan_warn.mk

Makefile updates for Blender 2.5 (from GSR)

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

SConscript

2009-03-30 18:21:17 +00:00