[Bf-blender-cvs] [3bef09f] asset-engine: Merge branch 'asset-experiments' into asset-engine

[Bastien Montagne]

Commit: 3bef09f672b67495294064641ad998f672294cd8
Author: Bastien Montagne
Date:   Tue May 12 19:39:44 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB3bef09f672b67495294064641ad998f672294cd8

Merge branch 'asset-experiments' into asset-engine

Conflicts:
	source/blender/blenkernel/CMakeLists.txt

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 9557399,37e5b36..d2db7a1
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -67,7 -68,7 +68,8 @@@ set(SR
  	intern/anim_sys.c
  	intern/appdir.c
  	intern/armature.c
+ 	intern/armature_update.c
 +	intern/asset.c
  	intern/autoexec.c
  	intern/blender.c
  	intern/bmfont.c