]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into akari/freezetag-fixes
authorAkari <hetors.email@gmail.com>
Mon, 10 Jan 2011 09:58:38 +0000 (11:58 +0200)
committerAkari <hetors.email@gmail.com>
Mon, 10 Jan 2011 09:58:38 +0000 (11:58 +0200)
commit7e4a382ddd408e08e694a8a34530b1b13c09c184
treeb363fc86c257f551c3e33270e1d9ad92c993107c
parent7aca33038217a5c72acabc5bf5181b8db76a021d
parent000100e5a06711f313310a4c35468e00c222eb4e
Merge branch 'master' into akari/freezetag-fixes