]> 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: bfcb108 1329364)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into...
authorJeremy Potter <git@stormdesign.us>
Fri, 17 Apr 2020 22:42:18 +0000 (15:42 -0700)
committerJeremy Potter <git@stormdesign.us>
Fri, 17 Apr 2020 22:42:18 +0000 (15:42 -0700)

Trivial merge