]> 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: 991d38a ab627cf)
Merge branch 'master' into terencehill/weapon_panel_retry
authorterencehill <piuntn@gmail.com>
Sun, 15 Feb 2015 18:55:56 +0000 (19:55 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 15 Feb 2015 18:55:56 +0000 (19:55 +0100)

Trivial merge