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

2011-10-24 12:43:08 +00:00
parent 70bf00a74c 4a04f72069
commit 15e6d6cd75
2127 changed files with 1341 additions and 4933 deletions
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id: CMakeLists.txt 12931 2007-12-17 18:20:48Z theeth $
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or