Commit: e41731286e478730787e39cfea68403f2b073db7
Author: Antony Riakiotakis
Date: Fri Jul 24 17:45:51 2015 +0200
Branches: temp_display_optimization
https://developer.blender.org/rBe41731286e478730787e39cfea68403f2b073db7
Merge branch 'master' into temp_display_optimization
Conflicts:
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/windowmanager/intern/wm_subwindow.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
