projects
/
xonotic
/
mediasource.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a18d7f6
ecc0d5e
)
Merge remote-tracking branch 'origin/mirceakitsune/screen_update'
author
mand1nga <mand1nga@xonotic.org>
Sun, 1 May 2011 23:23:43 +0000
(20:23 -0300)
committer
mand1nga <mand1nga@xonotic.org>
Sun, 1 May 2011 23:23:43 +0000
(20:23 -0300)
Trivial merge
projects / xonotic / mediasource.git / commitdiff