Martin Poirier e238066525 Merging with trunk ...

15568 - 15963

2008-08-05 02:27:09 +00:00

..

blender

Merging with trunk

2008-08-05 02:27:09 +00:00

creator

== Python scriptlinks ==

2008-07-26 22:00:26 +00:00

darwin

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

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

gameengine

Merging with trunk

2008-08-05 02:27:09 +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

Sync with Apricot Game Engine

2008-07-10 12:47:20 +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 of apricot branch game engine changes into trunk, excluding GLSL.

2008-06-17 10:27:34 +00:00

nan_compile.mk

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

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

nan_definitions.mk

Merge of apricot branch game engine changes into trunk, excluding GLSL.

2008-06-17 10:27:34 +00:00

nan_link.mk

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

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

nan_subdirs.mk

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

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

nan_warn.mk

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

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

SConscript

Filling in branch from trunk

2007-11-06 22:29:20 +00:00