]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44392b8 030abdf)
Merge branch 'Mario/ipv6_gamelog' into 'master'
authorMario <mario.mario@y7mail.com>
Tue, 21 Jan 2020 15:29:02 +0000 (15:29 +0000)
committerMario <mario.mario@y7mail.com>
Tue, 21 Jan 2020 15:29:02 +0000 (15:29 +0000)
Merge branch Mario/ipv6_gamelog (S merge request)

See merge request xonotic/xonotic-data.pk3dir!765


Trivial merge