[Bf-blender-cvs] [3a21279] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 3a21279bc8a9eaa80134a612400b4329b63e5428
Author: Bastien Montagne
Date:   Tue Aug 18 12:22:03 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB3a21279bc8a9eaa80134a612400b4329b63e5428

Merge branch 'master' into asset-experiments

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



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

diff --cc source/blender/editors/space_file/file_draw.c
index 592bda1,9922290..63bb24d
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@@ -48,9 -47,7 +48,9 @@@
  #include "BKE_global.h"
  #include "BKE_main.h"
  
 +#include "BLO_readfile.h"
 +
- #include "BLF_translation.h"
+ #include "BLT_translation.h"
  
  #include "IMB_imbuf_types.h"