projects
/
xonotic
/
mediasource.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
27956a4
a50ca1f
)
Merge remote-tracking branch 'origin/mirceakitsune/new_loading_screens'
author
Rudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 19:06:54 +0000
(21:06 +0200)
committer
Rudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 19:06:54 +0000
(21:06 +0200)
Trivial merge