]> 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: edca1c7 e557ad1)
Merge branch 'master' into terencehill/ca_ft_fixes
authorterencehill <piuntn@gmail.com>
Tue, 11 Jun 2013 12:57:08 +0000 (14:57 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 11 Jun 2013 12:57:08 +0000 (14:57 +0200)

Trivial merge