]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into debugger/aurora_ctf2 debugger/aurora_ctf2
authorMario <zacjardine@y7mail.com>
Sat, 24 Jan 2015 00:16:54 +0000 (11:16 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 24 Jan 2015 00:16:54 +0000 (11:16 +1100)
commit08bf47d4eb6b4a88acc95eabc7f5b215e15e48f2
treeecf5266fda3db5025f6a7872ed03a61dff2d1222
parent1c87b26674e5a8e379615c5133ad180c45889afb
parent208ff8cecfd188d3b8b7b9203a216dae9256f622
Merge remote-tracking branch 'origin/master' into debugger/aurora_ctf2

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