projects
/
xonotic
/
mediasource.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dd1ba05
4b016c7
)
Merge remote branch 'refs/remotes/origin/diabolik/sourceforplayers'
author
Rudolf Polzer <divverent@alientrap.org>
Tue, 25 May 2010 18:43:55 +0000
(20:43 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Tue, 25 May 2010 18:43:55 +0000
(20:43 +0200)
Trivial merge