]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1066e4 f346657)
Merge remote-tracking branch 'origin/TickleMeElmo/fix_naming_in_server_script'
authormerlijn <mhofstra@gmail.com>
Sat, 4 Jun 2011 17:37:40 +0000 (19:37 +0200)
committermerlijn <mhofstra@gmail.com>
Sat, 4 Jun 2011 17:37:40 +0000 (19:37 +0200)

Trivial merge