]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/menu_hudskin_selector
authorterencehill <piuntn@gmail.com>
Fri, 20 Nov 2015 19:10:54 +0000 (20:10 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 20 Nov 2015 19:10:54 +0000 (20:10 +0100)
commit892550d1f8d9e76649b118ff54255c033de6d8b0
treeb47a3acd63a3c1a6e07d36139600c3383cc3bfd9
parentd46b809856d414a1de04338569ad50dc7a9e081b
parentb0ee866d8377cb5572a0b22a4f4bdcdccb5091f9
Merge branch 'master' into terencehill/menu_hudskin_selector