]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87a39db 153389c)
Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Sun, 3 Oct 2010 12:57:04 +0000 (14:57 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 3 Oct 2010 12:57:04 +0000 (14:57 +0200)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge