Merge branch 'master' of ssh://gitlab.com/xonotic/netradiant
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 3 Aug 2015 16:28:42 +0000 (18:28 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 3 Aug 2015 16:28:42 +0000 (18:28 +0200)
1  2 
.gitignore
radiant/mainframe.cpp

diff --cc .gitignore
@@@ -1,4 -1,3 +1,5 @@@
  *.[oda]
 +.settings
 +games
  install
+ games
Simple merge