Roland Hess 1ff595a28e Conflicts resolved. Hadn't used the Resolve command last time. Brilliant.

2009-01-07 13:10:31 +00:00

..

blender

Conflicts resolved. Hadn't used the Resolve command last time. Brilliant.

2009-01-07 13:10:31 +00:00

creator

2.5 / Cleanup

2009-01-04 18:16:34 +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

Yeah, and then the game engine too!

2009-01-05 15:48:24 +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.5 / SCons

2008-12-23 16:07:24 +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

2.5

2009-01-05 17:20:40 +00:00

nan_compile.mk

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD

2008-12-14 17:32:24 +00:00

nan_definitions.mk

2.5 / Cleanup

2009-01-04 18:16:34 +00:00

nan_link.mk

2.5 / Cleanup

2009-01-04 18:16:34 +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

* Minor cleanup of SCons files

2008-10-22 11:28:10 +00:00