]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/defaults
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 17 Jul 2017 21:20:42 +0000 (23:20 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 17 Jul 2017 21:20:42 +0000 (23:20 +0200)
commitfd70aa63ce6db91dfdf8eb029c393926d9c773f0
treea0399125f40bc0daae84724c5412aeb0bc02f95b
parent6c871ae44368ac9ec3dc02351330004271eecbd3
parentcd2e3f4efb8e5f3c7db8b6c1654ee2c6a1eea05a
Merge branch 'master' into martin-t/defaults
defaultClient.cfg