Merge with trunk up to r38584.

2011-07-21 21:11:58 +00:00
parent cf34f7509f bbfe3c9c49
commit 4532bd731d
193 changed files with 18441 additions and 17999 deletions
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
 	../include
 	../../blenkernel
-	../../blenloader
 	../../blenlib
+	../../blenloader
 	../../makesdna
 	../../makesrna
 	../../windowmanager