]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 36a9f8f 96c2b36)
Merge remote branch 'origin/fruitiex/freezetag_vs_keepaway'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 15:18:20 +0000 (16:18 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 15:18:20 +0000 (16:18 +0100)

Trivial merge