]> de.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: 79fca1b 65300ef)
Merge branch 'master' into martin-t/linkexplode
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 14 Jan 2020 13:01:21 +0000 (14:01 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 14 Jan 2020 13:01:21 +0000 (14:01 +0100)

Trivial merge