]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into drjaska/mayhem
authordrjaska <drjaska83@gmail.com>
Tue, 18 Jan 2022 21:41:27 +0000 (23:41 +0200)
committerdrjaska <drjaska83@gmail.com>
Tue, 18 Jan 2022 21:41:27 +0000 (23:41 +0200)
commit9f220235a58a2d1659c90ee508b230f996156f2e
treeaefd26c04b4a009486c1812ae5c7ec0784e895c8
parent640f5fadfa6be37ebc1a2699e37bd12bb1607e71
parent6d997e7ed11d0f4a3449e8dcab751b06bb305743
Merge branch 'master' into drjaska/mayhem
balance-xonotic.cfg
balance-xpm.cfg
gamemodes-server.cfg
qcsrc/server/world.qc