# HG changeset patch
# User Teemu Piippo <crimsondusk64@gmail.com>
# Date 1411213665 -10800
# Node ID ed4163b265b359590d081c97f893d5abbfda36c8
# Parent  f0d14f16ae8794a4de9c76a9cffe0b780c6b0e24# Parent  f8e1852b91bcac160511b11d5372096ad5acffc3
- merged with default

diff -r f0d14f16ae87 -r ed4163b265b3 .gitignore
--- a/.gitignore	Tue Sep 09 02:44:02 2014 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-build
-build_shared
-build_debug
-build_release
-*.kdev4
-Makefile
-Makefile.*
-ldforge
-ldforge_debug
-*.dat
-debug_lastOutput
-debug_lastInput
-.kdev_include_paths
-*.cfg
-Git.h
-.kdev4
diff -r f0d14f16ae87 -r ed4163b265b3 .hgignore
--- a/.hgignore	Tue Sep 09 02:44:02 2014 +0300
+++ b/.hgignore	Sat Sep 20 14:47:45 2014 +0300
@@ -16,3 +16,4 @@
 .kdev4
 .*~
 *.orig
+CMakeLists.txt.user