Merged changes in the trunk up to revision 36757.

2011-05-19 01:40:37 +00:00
parent 31471f644c c04f9b779c
commit dfcd015535
275 changed files with 4189 additions and 3664 deletions
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -32,7 +32,7 @@ set(INC
 	../../render/extern/include
 	../../windowmanager
 	../../../../intern/guardedalloc
-    ${GLEW_INCLUDE_PATH}
+	${GLEW_INCLUDE_PATH}
 	../../freestyle
 )