diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-04 19:56:22 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-04 19:56:22 +0200 |
| commit | af3057df7eb41973349b407539846f17d9094c21 (patch) | |
| tree | 0940a188a0cfc43a99505f55513516866a57d145 /src/CBot/CBotString.cpp | |
| parent | f95df35dc58e01b99ffddfc4ad394feaa4460b09 (diff) | |
| download | colobot-af3057df7eb41973349b407539846f17d9094c21.tar.gz colobot-af3057df7eb41973349b407539846f17d9094c21.tar.bz2 colobot-af3057df7eb41973349b407539846f17d9094c21.zip | |
Merged changes from dev
Resolved conflicts & added fixes.
Diffstat (limited to 'src/CBot/CBotString.cpp')
| -rw-r--r-- | src/CBot/CBotString.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CBot/CBotString.cpp b/src/CBot/CBotString.cpp index 2a1e3bd..53b0f27 100644 --- a/src/CBot/CBotString.cpp +++ b/src/CBot/CBotString.cpp @@ -21,7 +21,7 @@ #include <string.h>
-HINSTANCE CBotString::m_hInstance = (HINSTANCE)LoadLibrary("Cbot.dll"); // comment le récupérer autrement ??
+HINSTANCE CBotString::m_hInstance = (HINSTANCE)LoadLibrary("libCbot.dll"); // comment le récupérer autrement ??
CBotString::CBotString()
|