Merge branch 'master' of https://gitlab.com/jdolan/netradiant
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 3 Aug 2015 16:28:15 +0000 (18:28 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 3 Aug 2015 16:28:15 +0000 (18:28 +0200)
1  2 
Makefile
download-gamepacks.sh

diff --cc Makefile
Simple merge
Simple merge