]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11018d4 c6378c2)
Merge remote-tracking branch 'origin' into Melanosuchus/modernize
authorMattia Basaglia <mattia.basaglia@gmail.com>
Mon, 20 Jul 2015 17:32:01 +0000 (19:32 +0200)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Mon, 20 Jul 2015 17:32:01 +0000 (19:32 +0200)

Trivial merge