Merge branch 'master' of ssh://gitlab.com/xonotic/netradiant

author Rudolf Polzer <divVerent@xonotic.org>

Mon, 3 Aug 2015 16:28:42 +0000 (18:28 +0200)

committer Rudolf Polzer <divVerent@xonotic.org>

Mon, 3 Aug 2015 16:28:42 +0000 (18:28 +0200)
author Rudolf Polzer <divVerent@xonotic.org>
Mon, 3 Aug 2015 16:28:42 +0000 (18:28 +0200)
committer Rudolf Polzer <divVerent@xonotic.org>
Mon, 3 Aug 2015 16:28:42 +0000 (18:28 +0200)
diff --cc .gitignore

index bbcc964d9e1328ab6c845895f21643f7859bc5e5,1bab8616f5eb3d19c3f966e6bfc0fed8c4fae490..250315188585b8595175591bba8efa14e8f801ff
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,5 @@@
   *.[oda]
+ +.settings
+ +games
   install
+ games
diff --cc radiant/mainframe.cpp
Simple merge
author	Rudolf Polzer <divVerent@xonotic.org>
	Mon, 3 Aug 2015 16:28:42 +0000 (18:28 +0200)
committer	Rudolf Polzer <divVerent@xonotic.org>
	Mon, 3 Aug 2015 16:28:42 +0000 (18:28 +0200)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	patch \|	diff1 \|	diff2 \|	blob \| history