]> 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 | compact (merge: 0c6fc30 043b5eb)
Merge branch 'master' into terencehill/misc_bugfixes
authorterencehill <piuntn@gmail.com>
Fri, 13 Aug 2010 14:56:49 +0000 (16:56 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 13 Aug 2010 14:56:49 +0000 (16:56 +0200)

Trivial merge