# HG changeset patch
# User Santeri Piippo <crimsondusk64@gmail.com>
# Date 1393178613 -7200
# Node ID 9813d79d7ba5a678ce2179706939ea459bb7bb01
# Parent  2e74d99ee7ecd5f2f24d7cade21eb31969219f1d# Parent  d74279066305e71e77f8cc5a0d128ca595f1f536
Merge ../ldforge into gl

diff -r 2e74d99ee7ec -r 9813d79d7ba5 CMakeLists.txt
--- a/CMakeLists.txt	Sun Feb 23 20:02:36 2014 +0200
+++ b/CMakeLists.txt	Sun Feb 23 20:03:33 2014 +0200
@@ -30,7 +30,6 @@
 	src/Document.cc
 	src/EditHistory.cc
 	src/ExternalPrograms.cc
-	src/Git.cc
 	src/GLRenderer.cc
 	src/GLCompiler.cc
 	src/LDConfig.cc
@@ -42,6 +41,7 @@
 	src/PartDownloader.cc
 	src/Primitives.cc
 	src/Types.cc
+	src/Version.cc
 	src/Widgets.cc
 	src/actions/MainActions.cc
 	src/actions/EditActions.cc