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/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
 * ***** BEGIN GPL LICENSE BLOCK *****
 *
 * This program is free software; you can redistribute it and/or