]> git.rm.cloudns.org Git - xonotic/xonotic.git/commit
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)
commit3a6c9910117edcaf2037fb0ad5b152592c2e26b1
tree486d04de4358fc8543d44e9780ce87913e400494
parentd1066e479cf8902154984f1d982ff285cd41f80d
parentf346657d6504f9290e97f50353f3d754667d6a69
Merge remote-tracking branch 'origin/TickleMeElmo/fix_naming_in_server_script'