]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:56:25 +0000 (18:56 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:56:25 +0000 (18:56 +0300)
commit49788d5b763cee217d76a2078e96e51e6049078c
tree9c6bb302ebb4ddf0829ea0bc91cb5f5dc014f43c
parentd759b94e62f43747b86e091a8baae04b69b56649
parenta51cbdfb38a5a52863e2fa4f1905022eba778e52
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
qcsrc/common/notifications/all.inc
qcsrc/server/g_world.qc