]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90a5797 c2d78b9)
Merge branch 'master' of ssh://gitlab.com/xonotic/netradiant into Melanosuchus/modernize Melanosuchus/modernize 6/head
authorMattia Basaglia <mattia.basaglia@gmail.com>
Wed, 22 Jul 2015 08:22:56 +0000 (10:22 +0200)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Wed, 22 Jul 2015 08:22:56 +0000 (10:22 +0200)

Trivial merge