[Bf-blender-cvs] [31d6ffc] soc-2014-viewport_context: Merge branch 'soc-2014-viewport_context' of git.blender.org:blender into soc-2014-viewport_context

Jason Wilkins noreply at git.blender.org
Fri Jul 25 08:11:04 CEST 2014


Commit: 31d6ffcef825bd8354776cea8f83ea0dd546c75a
Author: Jason Wilkins
Date:   Fri Jul 25 01:10:26 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rB31d6ffcef825bd8354776cea8f83ea0dd546c75a

Merge branch 'soc-2014-viewport_context' of git.blender.org:blender into soc-2014-viewport_context

Conflicts:
	source/blender/gpu/intern/gpu_select.c

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



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






More information about the Bf-blender-cvs mailing list