Cycles: svn merge -r41225:41232 ^/trunk/blender

2011-10-24 22:32:00 +00:00
parent 55ab66b455 c49cdf5eec
commit 4cd1e6337e
2197 changed files with 1495 additions and 5093 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,4 @@
 # -*- mode: cmake; indent-tabs-mode: t; -*-
-# $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or