summaryrefslogtreecommitdiff
path: root/src/net/download.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-06-13 13:16:16 -0600
committerJared Adams <jaxad0127@gmail.com>2010-06-13 13:16:16 -0600
commite8bea8a6edf69e824a922adeb5e697111ceabe90 (patch)
treedb1937956bc585b300f2a2c8312af4ad5bf924de /src/net/download.cpp
parent593fd2b831304c8e421589aab0fb158e4b7e9c35 (diff)
parent0b15a3ad32838134384524ce4af95d65b0b4e5da (diff)
downloadmana-client-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.gz
mana-client-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.bz2
mana-client-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.xz
mana-client-e8bea8a6edf69e824a922adeb5e697111ceabe90.zip
Merge remote branch '1.0/1.0'
Conflicts: data/graphics/CMakeLists.txt data/graphics/Makefile.am src/client.cpp
Diffstat (limited to 'src/net/download.cpp')
-rw-r--r--src/net/download.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 2b96a6b9..a2cd4910 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -122,7 +122,7 @@ void Download::setWriteFunction(WriteFunction write)
bool Download::start()
{
- logger->log("Starting download: %s\n", mUrl.c_str());
+ logger->log("Starting download: %s", mUrl.c_str());
mThread = SDL_CreateThread(downloadThread, this);
@@ -140,7 +140,7 @@ bool Download::start()
void Download::cancel()
{
- logger->log("Canceling download: %s\n", mUrl.c_str());
+ logger->log("Canceling download: %s", mUrl.c_str());
mOptions.cancel = true;
if (mThread && SDL_GetThreadID(mThread) != 0)