]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0995639 e4739f5)
Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
authorRudolf Polzer <rpolzer@grawp.(none)>
Fri, 26 Mar 2010 07:59:18 +0000 (08:59 +0100)
committerRudolf Polzer <rpolzer@grawp.(none)>
Fri, 26 Mar 2010 07:59:18 +0000 (08:59 +0100)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge