[Bf-blender-cvs] [36f2284] soc-2014-viewport_context: removed a duplicate gpu include directory in editor/armature/CMakeLists.txt that was added by a merge

[Jason Wilkins]

Commit: 36f2284a9ef410948f0f68cd9ac1202320c03e00
Author: Jason Wilkins
Date:   Thu Jul 24 12:27:25 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rB36f2284a9ef410948f0f68cd9ac1202320c03e00

removed a duplicate gpu include directory in editor/armature/CMakeLists.txt that was added by a merge

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

M	source/blender/editors/armature/CMakeLists.txt

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

diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt
index 8c71fd8..fc211f0 100644
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -27,7 +27,6 @@ set(INC
 	../../makesdna
 	../../makesrna
 	../../windowmanager
-	../../gpu
 	../../../../intern/guardedalloc
 	../../../../intern/glew-mx
 )