]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNikolay S <nick@teichisma.info>
Thu, 21 Sep 2023 20:32:21 +0000 (23:32 +0300)
committerNikolay S <nick@teichisma.info>
Thu, 21 Sep 2023 20:32:21 +0000 (23:32 +0300)
commitd2542e835bb2e1a237737a7017d7fdfb1620b2f3
tree3dedfb7d37fb71ab166b2f3a52c7aa410526adac
parent2494f19405517c594ddee30a58d46dc9e2617723
parentc8b0874b6d23547861cc7a6c1e050e32e45463f8
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
qcsrc/client/hud/panel/strafehud.qc
qcsrc/server/main.qc