projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6643657
9e4a6e1
)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
author
Rudolf Polzer <divVerent@xonotic.org>
Thu, 20 Jan 2011 09:53:21 +0000
(10:53 +0100)
committer
Rudolf Polzer <divVerent@xonotic.org>
Thu, 20 Jan 2011 09:53:21 +0000
(10:53 +0100)
1
2
all
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
all
Simple merge