From af3057df7eb41973349b407539846f17d9094c21 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Wed, 4 Jul 2012 19:56:22 +0200
Subject: Merged changes from dev

Resolved conflicts & added fixes.
---
 src/CBot/CBotString.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CBot/CBotString.cpp')

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()
-- 
cgit v1.2.3-1-g7c22