Daniel Genrich 11ec880483 Clean up merging conflict

2008-09-03 16:10:20 +00:00

..

blender

Clean up merging conflict

2008-09-03 16:10:20 +00:00

creator

svn merge -r 15688:15908 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-01 21:37:36 +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

BGE patch 17547 applied in trunk: Cleaned up pydoc for BGE, compiles now error free

2008-08-31 19:07:10 +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

svn merge -r 16077:16174 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-18 14:33:26 +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

TLC needed for Makefiles to get gameengine compiling again.

2008-08-25 19:50:17 +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

fix settings for freebsd7

2008-08-23 13:12:17 +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