Campbell Barton 15e6d6cd75 svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

..

intern

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

CMakeLists.txt

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

GPU_buffers.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

GPU_draw.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

GPU_extensions.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

GPU_material.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

SConscript

Merged the particles-2010 branch with node improvements into trunk.

2011-09-05 21:01:50 +00:00