]> 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: 5cb9246 f36464f)
Merge branch 'master' into terencehill/scoreboard_fineadjustments
authorterencehill <piuntn@gmail.com>
Mon, 27 Jun 2011 16:31:10 +0000 (18:31 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 27 Jun 2011 16:31:10 +0000 (18:31 +0200)

Trivial merge