Matt Ebb 740752da12 * Hopefully fix some weird merging business

2009-08-26 06:51:26 +00:00

..

extern/include

svn merge -r 22450:22627 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender

2009-08-19 11:18:52 +00:00

intern

* Hopefully fix some weird merging business

2009-08-26 06:51:26 +00:00

CMakeLists.txt

svn merge -r 22450:22627 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender

2009-08-19 11:18:52 +00:00

Makefile

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

2008-04-16 22:40:48 +00:00

SConscript

* scons fixes for voxel data texture

2009-08-15 07:49:56 +00:00