]> 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: b271a2e 575fbdc)
Merge remote branch 'origin/divVerent/map-weapon-rebalance'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 15 Nov 2010 10:53:44 +0000 (11:53 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 15 Nov 2010 10:53:44 +0000 (11:53 +0100)

Trivial merge