Joseph Eagar 994a8bd80f pre-merge commit

2009-06-10 13:19:38 +00:00

..

blender

pre-merge commit

2009-06-10 13:19:38 +00:00

creator

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

darwin

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

gameengine

(NOTE: DO NOT TEST)

2009-06-10 10:06:25 +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

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

nan_compile.mk

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

nan_definitions.mk

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +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

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00