]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/mg-solidpen' into martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 12 Aug 2019 15:20:29 +0000 (17:20 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 12 Aug 2019 15:20:29 +0000 (17:20 +0200)
commitb092aabc630d120732e86877eeae416e22222653
tree0e1c5efc1854237523b13d2d98fe65265d47e83d
parentc060a62c1f112d8f449388dffcb2ca9ddf027692
parent3ad07d4d8ecae45a69a554f975fd986bc3b99a88
Merge branch 'martin-t/mg-solidpen' into martin-t/master2
bal-wep-xonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/weapons/tracing.qc
xonotic-server.cfg