[Bf-blender-cvs] [cafeb19] soc-2014-viewport_context: Merge branch 'master' into soc-2014-viewport_context

Campbell Barton noreply at git.blender.org
Sat Aug 2 11:00:03 CEST 2014


Commit: cafeb1923b5d6ca2b960222f836757557900dade
Author: Campbell Barton
Date:   Sat Aug 2 18:54:54 2014 +1000
Branches: soc-2014-viewport_context
https://developer.blender.org/rBcafeb1923b5d6ca2b960222f836757557900dade

Merge branch 'master' into soc-2014-viewport_context

Conflicts:
	intern/ghost/intern/GHOST_WindowWin32.cpp

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



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






More information about the Bf-blender-cvs mailing list