]> 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: bf753d4 0a85e9a)
Merge branch 'martin-t/globals' of git://de.git.xonotic.org/xonotic/xonotic-data...
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 12 Nov 2018 19:57:40 +0000 (20:57 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 12 Nov 2018 19:57:40 +0000 (20:57 +0100)

Trivial merge