]> de.git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c1347d 058d912)
Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Mon, 28 Jun 2010 12:27:41 +0000 (14:27 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 28 Jun 2010 12:27:41 +0000 (14:27 +0200)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge