]> 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: ce272d4 276a9d9)
Merge branch 'master' into terencehill/screenshot_viewer
authorterencehill <piuntn@gmail.com>
Sun, 5 Jun 2011 22:40:03 +0000 (00:40 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 5 Jun 2011 22:40:03 +0000 (00:40 +0200)

Trivial merge