]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/fruitiex/rifleiconfix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 20:43:04 +0000 (21:43 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 20:43:04 +0000 (21:43 +0100)
commitee483e800d687419bb51097e78883b6b87bf558c
tree6690b9b78a6b031e51fffd02b9e783041cdec2a4
parent477edde098979fa53cd3304d26dfec00e41003b5
parent9f0a623c3ec1d5ab85fbc36ba6c353fd63edc4ff
Merge remote branch 'origin/fruitiex/rifleiconfix'