]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/ok-config' into martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Aug 2019 18:32:50 +0000 (20:32 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Aug 2019 18:32:50 +0000 (20:32 +0200)
commitb63195011e7818effa58e2bf29747660487236b9
tree2b5cfd8554be90106fabac441ff7c2e32dd7d305
parent63839b3d12adb14b7f8e5c2e2db82436da36d9b0
parentca9f533b1a28ea7648da1df2c6548f11675d2bc1
Merge branch 'martin-t/ok-config' into martin-t/master2
bal-wep-xonotic.cfg