]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into debugger/go
authorMario <zacjardine@y7mail.com>
Thu, 4 Dec 2014 23:37:44 +0000 (10:37 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 4 Dec 2014 23:37:44 +0000 (10:37 +1100)
commit90be1a95b8be5e1ee45ee9e13d3987782dc27cf9
tree8bad8c7b7d8673d69b84de0cd1d34721e5fe8e2c
parent3e9e61e465a46f8e6b572f800a448dc17a5675a5
parent8977c1928dccbf4567088b2efd3171260ca9162a
Merge remote-tracking branch 'origin/master' into debugger/go

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