projects
/
xonotic
/
darkplaces.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d0d5035
83d0515
)
::stable-branch::reset=83d0515e854d7acf232a792868fe330bdbd716bf
author
Rudolf Polzer <divverent@alientrap.org>
Sat, 12 Feb 2011 13:48:08 +0000
(14:48 +0100)
committer
Rudolf Polzer <divverent@alientrap.org>
Sat, 12 Feb 2011 13:48:08 +0000
(14:48 +0100)
Trivial merge