]> 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: c131c80 b92e262)
Merge remote-tracking branch 'origin/atheros/item_keys'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 24 Oct 2011 09:54:23 +0000 (11:54 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 24 Oct 2011 09:54:23 +0000 (11:54 +0200)

Trivial merge