]> 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: c9dfc84 0275076)
Merge branch 'master' into terencehill/screenshot_viewer
authorterencehill <piuntn@gmail.com>
Fri, 6 Aug 2010 11:02:50 +0000 (13:02 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 6 Aug 2010 11:02:50 +0000 (13:02 +0200)

Trivial merge