From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 3 Aug 2015 16:28:42 +0000 (+0200)
Subject: Merge branch 'master' of ssh://gitlab.com/xonotic/netradiant
X-Git-Tag: xonotic-v0.8.1~1
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=f806ac65b11eb35a8ffd5df61ac1aed06763d49e;p=xonotic%2Fnetradiant.git

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

f806ac65b11eb35a8ffd5df61ac1aed06763d49e
diff --cc .gitignore
index bbcc964d,1bab8616..25031518
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,5 @@@
  *.[oda]
 +.settings
 +games
  install
+ games