]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1f2cac cd29375)
Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:01:03 +0000 (20:01 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:01:03 +0000 (20:01 +0200)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge