]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/AMMO' into martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 18 Aug 2019 18:31:56 +0000 (20:31 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 18 Aug 2019 18:31:56 +0000 (20:31 +0200)
commitbee32c72c87c66ede25a9746bd957c2739132e81
treeefc4a5a054e457bfa541965063f453275e486d92
parent607485df3a63bcd07cba8b15cad8b90f9925e891
parent0ae17929fade051984a1c76e49f86f36263e79b1
Merge branch 'martin-t/AMMO' into martin-t/master2
bal-wep-xonotic.cfg
xonotic-server.cfg