]> 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: e0a14de 2c8367d)
Merge branch 'Mario/itemstime_editor_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 10 Mar 2017 17:37:24 +0000 (17:37 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 10 Mar 2017 17:37:24 +0000 (17:37 +0000)
Merge branch Mario/itemstime_editor_fix (S merge request)

See merge request !415


Trivial merge