]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e38c7bf 5a29db4)
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 patch | diff1 | diff2 | blob | history
download-gamepacks.sh patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc download-gamepacks.sh
Simple merge