]> 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: 60c268b 81b28ea)
Merge remote branch 'remotes/origin/terencehill/misc_bugfixes' into terencehill/misc_...
authorterencehill <piuntn@gmail.com>
Wed, 18 Aug 2010 22:46:37 +0000 (00:46 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 18 Aug 2010 22:46:37 +0000 (00:46 +0200)

Trivial merge