Andre Susano Pinto c7dbc65488 svn merge -r 15292:15392 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-06-30 22:57:52 +00:00

..

blender

svn merge -r 15292:15392 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-06-30 22:57:52 +00:00

creator

svn merge -r 15292:15392 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-06-30 22:57: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

svn merge -r 15292:15392 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-06-30 22:57: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

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

2008-04-16 22:40:48 +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

svn merge -r 15202:15292 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-06-20 21:36:15 +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

svn merge -r 15202:15292 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-06-20 21:36:15 +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