]> 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: 5271334 fb6b5a2)
Merge remote branch 'remotes/origin/terencehill/screenshot_viewer' into terencehill...
authorterencehill <piuntn@gmail.com>
Wed, 18 Aug 2010 22:44:23 +0000 (00:44 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 18 Aug 2010 22:44:23 +0000 (00:44 +0200)

Trivial merge