projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1bc0cc6
2ec7592
)
Merge commit 'origin/esteel/renames'
author
Rudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 12:25:03 +0000
(14:25 +0200)
committer
Rudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 12:25:03 +0000
(14:25 +0200)
Conflicts:
server/readme.txt
Trivial merge