projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
474bca1
740a38b
)
Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
author
Rudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 12:11:23 +0000
(14:11 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 12:11:23 +0000
(14:11 +0200)
1
2
all
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
all
Simple merge
projects / xonotic / xonotic.git / commitdiff