projects
/
xonotic
/
netradiant.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e995cc8
5bd5f58
)
Merge commit 'refs/pull/1/head' of https://github.com/xonotic/netradient
author
Rudolf Polzer <divverent@xonotic.org>
Mon, 1 Jun 2015 08:45:24 +0000
(10:45 +0200)
committer
Rudolf Polzer <divverent@xonotic.org>
Mon, 1 Jun 2015 08:45:24 +0000
(10:45 +0200)
Trivial merge