]> 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: 257fe91 294a6d5)
Merge branch 'master' into terencehill/screenshot_viewer
authorterencehill <piuntn@gmail.com>
Sun, 3 Jul 2011 17:33:29 +0000 (19:33 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 3 Jul 2011 17:33:29 +0000 (19:33 +0200)

Trivial merge