]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Tue, 22 Aug 2017 20:00:35 +0000 (23:00 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 22 Aug 2017 20:00:35 +0000 (23:00 +0300)
commit23f9cf107cc057192fee3695e4e95261aa6bf205
tree07d1c2b3839b83609043a8bc5e36e14bd42a0866
parentfe164b6b4a927a945f89484d6e96559c7f63f5d1
parent91f8e306251305c697fa216b2fa4ea8def4a4f67
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master