]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into debugger/aurora_ctf
authorMario <zacjardine@y7mail.com>
Sat, 24 Jan 2015 00:19:13 +0000 (11:19 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 24 Jan 2015 00:19:13 +0000 (11:19 +1100)
commit9a2f01b628e58eb9a8e5efbab32714312071261b
tree0ad838ae009540067777d35492a369107a8fcc6d
parent9a91733b6fe6de77b970edc1aecbe5fc7797c42d
parent208ff8cecfd188d3b8b7b9203a216dae9256f622
Merge remote-tracking branch 'origin/master' into debugger/aurora_ctf

Conflicts:
scripts/shaderlist.txt
scripts/shaderlist.txt