]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 4 Jan 2012 15:41:48 +0000 (16:41 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 4 Jan 2012 15:41:48 +0000 (16:41 +0100)
commite143b186a0fa81033be1c502e9933068fd6655a2
tree9baaffe2abf9683d32c02d89874124672ac84610
parent4b834a8f1dc20bf639d3e434a768918f9ff6c1f6
parente575b7d74e27723e1967dfe4be3a5becf0840387
Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone