]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 182f361 1024b5c)
Merge branch 'martin-t/flag' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 26 Aug 2017 14:05:57 +0000 (14:05 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 26 Aug 2017 14:05:57 +0000 (14:05 +0000)
Allow 3 flag throws in ctf

See merge request !470


Trivial merge