]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/globals' of git://de.git.xonotic.org/xonotic/xonotic-data...
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 12 Nov 2018 19:57:40 +0000 (20:57 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 12 Nov 2018 19:57:40 +0000 (20:57 +0100)
commitac4f809419574ad8c2f10bc0531b303ed98c109f
treeae03782611724a21542f4f9fcfd29e4e103bbfbf
parentbf753d4f70c80a058d03e83577b0f7c1c62ebf5f
parent0a85e9a4a6c81d4776f1d9dbd93ace1442742bbd
Merge branch 'martin-t/globals' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into martin-t/globals