]> 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: b47667e b8244e7)
Merge branch 'master' into terencehill/screenshot_viewer
authorterencehill <piuntn@gmail.com>
Thu, 5 Jul 2012 19:58:27 +0000 (21:58 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 5 Jul 2012 19:58:27 +0000 (21:58 +0200)

Trivial merge