]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1337291 f3fce2b)
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Tue, 4 Apr 2017 18:54:00 +0000 (21:54 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 4 Apr 2017 18:54:00 +0000 (21:54 +0300)

Trivial merge