[Bf-blender-cvs] [637b54e] depsgraph_refactor: Merge branch 'master' into depsgraph_refactor

[Sergey Sharybin]

Commit: 637b54e4fea04dcb2d95297a8bb5dd7f4b014846
Author: Sergey Sharybin
Date:   Fri Dec 5 12:22:55 2014 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB637b54e4fea04dcb2d95297a8bb5dd7f4b014846

Merge branch 'master' into depsgraph_refactor

===================================================================



===================================================================

diff --cc source/blender/editors/space_info/info_draw.c
index 7ecaced,e289510..cc9f47b
--- a/source/blender/editors/space_info/info_draw.c
+++ b/source/blender/editors/space_info/info_draw.c
@@@ -33,9 -33,7 +33,8 @@@
  #include <sys/stat.h>
  #include <limits.h>
  
- #include "BLF_api.h"
  
 +#include "BLI_rect.h"
  #include "BLI_utildefines.h"
  
  #include "DNA_space_types.h"
diff --cc source/creator/CMakeLists.txt
index 355f5e5,0e3b7a9..b1c1faa
mode 100644,100755..100755
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt