Campbell Barton 2cd5436a81 svn merge ^/trunk/blender -r42839:42871

2011-12-25 21:31:19 +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

dna_genfile.c

svn merge ^/trunk/blender -r42839:42871

2011-12-25 21:31:19 +00:00

makesdna.c

replace u_int64_t with cc99's uint64_t as suggested by Nicholas Bishop.

2011-12-24 03:03:42 +00:00

SConscript

svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-24 02:29:45 +00:00