summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-06-08 23:10:13 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-06-08 23:10:13 +0200
commit420e770c619c23e6bff94260bb260d289e769534 (patch)
tree58c3c464db0a3ad3cbeb835e0c52911de816e8d2 /src/main.cpp
parent8596b1a8102726de0d7b3df12dff86f5c974e6fe (diff)
parent2a60ed3f85004c872eb9d0ae39d4aa1c47626543 (diff)
downloadmana-420e770c619c23e6bff94260bb260d289e769534.tar.gz
mana-420e770c619c23e6bff94260bb260d289e769534.tar.bz2
mana-420e770c619c23e6bff94260bb260d289e769534.tar.xz
mana-420e770c619c23e6bff94260bb260d289e769534.zip
Merge branch '0.0.29'
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 86008d7f..3ea8aa2d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -940,7 +940,7 @@ int main(int argc, char *argv[])
setupButton->setPosition(top->getWidth() - setupButton->getWidth() - 3, 3);
top->add(setupButton);
- sound.playMusic(branding.getValue("loginMusic", "Login.ogg"));
+ sound.playMusic(branding.getValue("loginMusic", "Magick - Real.ogg"));
// Initialize login data
loginData.hostname = options.serverName;