]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: beeadcf c23f66f)
Merge remote branch 'refs/remotes/origin/divVerent/switchback-to-http'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 05:38:51 +0000 (07:38 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 05:38:51 +0000 (07:38 +0200)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge