]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Sat, 14 May 2011 18:20:57 +0000 (21:20 +0300)
committerFruitieX <fruitiex@gmail.com>
Sat, 14 May 2011 18:20:57 +0000 (21:20 +0300)
commitfa4fc49a58592a64c63b5f8bcf4421db91c234f3
treef4ac1b19e6237321e95dd05a3d1d8c1dcdacd926
parente6003fb86e11cc3d537395e7205bd9c4cf4d5567
parent852b9503db3046f5e42e1dafb771c371e4c47d19
Merge remote-tracking branch 'origin/master' into fruitiex/panelhud
qcsrc/client/Main.qc