Campbell Barton aa1ba2f3fb svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17279:HEAD ...

somehow scripts line endings change is messing things up, these changes wont be included
error is:
svn: File 'release/scripts/scripttemplate_metaball_create.py' has inconsistent newlines
svn: Inconsistent line ending style
svn: Error reading spooled REPORT request response

2008-11-05 15:11:40 +00:00

..

blender

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

2008-11-05 15:11:40 +00:00

creator

Added bf_videotex to unix libraries (linking error)

2008-11-02 14:54:44 +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

VideoTexture: Add support for GLSL. FIx small printout bug in Exception printout

2008-11-05 13:22: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

Merge from trunk

2008-09-19 14:15:36 +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

Makefile fixes for compiling with new videotexture code.

2008-11-02 18:12:45 +00:00

nan_compile.mk

Makefile fixes for compiling with new videotexture code.

2008-11-02 18:12:45 +00:00

nan_definitions.mk

2008-10-22 05:35:23 +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

* Minor cleanup of SCons files

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