diff options
| author | Chuck Miller <shadowmil@gmail.com> | 2010-08-15 15:57:21 -0400 |
|---|---|---|
| committer | Chuck Miller <shadowmil@gmail.com> | 2010-08-15 15:57:21 -0400 |
| commit | 8f573b6c425dc82be42ad80eae565b0641a90a3b (patch) | |
| tree | 149c7889d384e10fd9dc95f1aa90478e69b314c8 /src/net/manaserv/network.cpp | |
| parent | fee9fbce12e620f25aecdc0690285cc47fa8791d (diff) | |
| parent | 2b676bbf6fcf7dfd45cb33f06dacd2ca5bce19fe (diff) | |
| download | mana-8f573b6c425dc82be42ad80eae565b0641a90a3b.tar.gz mana-8f573b6c425dc82be42ad80eae565b0641a90a3b.tar.bz2 mana-8f573b6c425dc82be42ad80eae565b0641a90a3b.tar.xz mana-8f573b6c425dc82be42ad80eae565b0641a90a3b.zip | |
Merge branch '1.0'
Conflicts:
mana.cbp
mana.files
src/CMakeLists.txt
src/Makefile.am
src/utils/xml.cpp
Diffstat (limited to 'src/net/manaserv/network.cpp')
| -rw-r--r-- | src/net/manaserv/network.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp index 607100b7..a5bf6186 100644 --- a/src/net/manaserv/network.cpp +++ b/src/net/manaserv/network.cpp @@ -73,7 +73,7 @@ void finalize() if (connections) { logger->error("Tried to shutdown the network subsystem while there " - "are network connections left!"); + "are network connections left!"); } clearNetworkHandlers(); @@ -85,7 +85,7 @@ Connection *getConnection() if (!client) { logger->error("Tried to instantiate a network object before " - "initializing the network subsystem!"); + "initializing the network subsystem!"); } return new Connection(client); |