]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 21a4047 5074d54)
Merge remote branch 'origin/merlijn/finished/rcon2irc-fix'
authorRudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 12:50:38 +0000 (14:50 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 12:50:38 +0000 (14:50 +0200)

Trivial merge