Ian Thompson ed5002458b Merged 15771:15912 from trunk

2008-08-01 23:39:52 +00:00

..

blender

Merged 15771:15912 from trunk

2008-08-01 23:39:52 +00:00

creator

Merged 15771:15912 from trunk

2008-08-01 23:39:52 +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

Merged 15771:15912 from trunk

2008-08-01 23:39:52 +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

Merged 15170:15635 from trunk (no conflicts or even merges)

2008-07-18 23:35:34 +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

Merged 15170:15635 from trunk (no conflicts or even merges)

2008-07-18 23:35: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

Merged 15170:15635 from trunk (no conflicts or even merges)

2008-07-18 23:35: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