Campbell Barton 75697c40a0 svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22717:22875

2009-08-29 23:41:09 +00:00

..

include

* Hopefully fix some weird merging business

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

source

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22717:22875

2009-08-29 23:41:09 +00:00

Makefile

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

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