projects
/
xonotic
/
darkplaces.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a02138f
48dd658
)
::stable-branch::reset=48dd658f8bbfa60efbd5f56d1c208727c4418078
author
Rudolf Polzer <divverent@xonotic.org>
Mon, 6 Jan 2014 10:16:12 +0000
(11:16 +0100)
committer
Rudolf Polzer <divverent@xonotic.org>
Mon, 6 Jan 2014 10:16:12 +0000
(11:16 +0100)
Trivial merge
projects / xonotic / darkplaces.git / commitdiff