]> 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: 422afb8 0df96e4)
Merge branch 'master' into terencehill/screenshot_viewer
authorterencehill <piuntn@gmail.com>
Sat, 9 Apr 2011 17:34:08 +0000 (19:34 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 9 Apr 2011 17:34:08 +0000 (19:34 +0200)

Trivial merge