]> 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: 6ff0130 d793106)
Merge branch 'master' into terencehill/hud_skin_files_sync
authorterencehill <piuntn@gmail.com>
Mon, 12 Dec 2011 12:32:24 +0000 (13:32 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 12 Dec 2011 12:32:24 +0000 (13:32 +0100)

Trivial merge