projects
/
xonotic
/
mediasource.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7132596
0c7d462
)
Merge remote branch 'refs/remotes/origin/fruitiex/crosshairs_src'
author
Rudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 06:46:55 +0000
(08:46 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 06:46:55 +0000
(08:46 +0200)
Trivial merge
projects / xonotic / mediasource.git / commitdiff