]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into divVerent/opera-by-morphed
authorRudolf Polzer <divverent@alientrap.org>
Thu, 19 Jan 2012 18:22:58 +0000 (19:22 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 19 Jan 2012 18:22:58 +0000 (19:22 +0100)
commit7de789f4d08b933b19d7dcc9752ec7cb37ecfe30
treedec0d675cdeeba7b0b7c96973670c5f2cfd391d6
parentfda11822a9e1531837b9e8d3b31f29be8ff05e98
parent39c6eb943737cb0b5001f3123b7732c8e9d3ad43
Merge branch 'master' into divVerent/opera-by-morphed
scripts/shaderlist.txt