]> 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: f1244c4 fcd8d26)
Merge branch 'master' into terencehill/weapon_panel_fix
authorterencehill <piuntn@gmail.com>
Sun, 1 Feb 2015 13:09:39 +0000 (14:09 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 1 Feb 2015 13:09:39 +0000 (14:09 +0100)

Trivial merge