]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/defaults' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 7 Aug 2017 05:23:18 +0000 (05:23 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 7 Aug 2017 05:23:18 +0000 (05:23 +0000)
commit80591bb9b8da20213b38d3651b094d15cf902dbe
treefb8b126f1880d8fa30f6fe85bf3068b9a58f22bd
parentdc722625fdaf24c32143032ad0866afc6b66e567
parentae277921268b84c7b7ee5ab901ce7f0088c07605
Merge branch 'martin-t/defaults' into 'master'

Split defaultXonotic to server and client

See merge request !459