- merged two default heads

Wed, 05 Nov 2014 23:41:58 +0200

author
Teemu Piippo <crimsondusk64@gmail.com>
date
Wed, 05 Nov 2014 23:41:58 +0200
changeset 909
f025ab5e57ac
parent 904
f8e1852b91bc (diff)
parent 902
3a69c2e0532c (current diff)
child 912
3feb4d20092d
child 920
147497785496

- merged two default heads

--- 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
--- 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

mercurial