part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :)

2010-07-19 04:44:37 +00:00
parent f54aa78110 7f083c45be
commit c11c196efa
1714 changed files with 119636 additions and 84178 deletions
--- a/source/blender/editors/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -1,5 +1,5 @@
 /**
- * $Id:
+ * $Id$
 *
 * ***** BEGIN GPL LICENSE BLOCK *****
 *