[Bf-blender-cvs] [42ea749] asset-experiments: Merge branch 'id-remap' into asset-experiments

[Bastien Montagne]

Commit: 42ea7490e586bf85bc9cd1aee52de360f5d540b4
Author: Bastien Montagne
Date:   Wed Apr 27 11:01:48 2016 +0200
Branches: asset-experiments
https://developer.blender.org/rB42ea7490e586bf85bc9cd1aee52de360f5d540b4

Merge branch 'id-remap' into asset-experiments

Conflicts:
	source/blender/windowmanager/intern/wm_files_link.c
	source/blender/windowmanager/wm_files.h

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



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

diff --cc source/blender/windowmanager/wm_files.h
index c88ca77,396907a..cda888f
--- a/source/blender/windowmanager/wm_files.h
+++ b/source/blender/windowmanager/wm_files.h
@@@ -59,7 -59,8 +59,9 @@@ void        WM_OT_save_mainfile(struct 
  void        WM_OT_link(struct wmOperatorType *ot);
  void        WM_OT_append(struct wmOperatorType *ot);
  
 +void        WM_OT_assets_update_check(struct wmOperatorType *ot);
+ void        WM_OT_lib_relocate(struct wmOperatorType *ot);
+ void        WM_OT_lib_reload(struct wmOperatorType *ot);
  
  #endif /* __WM_FILES_H__ */