]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e93f430 e8c06bc)
Merge remote branch 'origin/fruitiex/gamemode_freezetag' into fruitiex/gamemode_freezetag
authorFruitieX <fruitiex@gmail.com>
Wed, 17 Nov 2010 18:56:59 +0000 (20:56 +0200)
committerFruitieX <fruitiex@gmail.com>
Wed, 17 Nov 2010 18:56:59 +0000 (20:56 +0200)

Trivial merge