# HG changeset patch
# User Teemu Piippo <crimsondusk64@gmail.com>
# Date 1415223718 -7200
# Node ID f025ab5e57ac33d32d8e1b10c3ec7b28c5d4c570
# Parent  f8e1852b91bcac160511b11d5372096ad5acffc3# Parent  3a69c2e0532cf43e24ac1796a5c1ace0b22f05b4
- merged two default heads

diff -r 3a69c2e0532c -r f025ab5e57ac .gitignore
--- a/.gitignore	Thu Oct 23 03:16:50 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 3a69c2e0532c -r f025ab5e57ac .hgignore
--- a/.hgignore	Thu Oct 23 03:16:50 2014 +0300
+++ b/.hgignore	Wed Nov 05 23:41:58 2014 +0200
@@ -16,3 +16,4 @@
 .kdev4
 .*~
 *.orig
+CMakeLists.txt.user