From 011d86ed668cbbff5c7bfc5f7e88086acb849921 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Sun, 15 Apr 2012 00:50:13 +0200
Subject: Pulled changes from test mingw branch

* include fixes
* syntax fixes for MinGW
* fixed encoding of restext.cpp
* temporary fix for MinGW in joystick.cpp

Successfully compiles under MinGW :)
---
 src/CBot/TestCBot/TestCBotDoc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CBot/TestCBot/TestCBotDoc.cpp')

diff --git a/src/CBot/TestCBot/TestCBotDoc.cpp b/src/CBot/TestCBot/TestCBotDoc.cpp
index fdb8604..8880c57 100644
--- a/src/CBot/TestCBot/TestCBotDoc.cpp
+++ b/src/CBot/TestCBot/TestCBotDoc.cpp
@@ -643,7 +643,7 @@ if ( mode == 2 ) if (!m_pProg->Compile(m_DocText, m_Liste, (void*) 44))
 			while ( pVar != NULL )
 			{
 				info += sep;
-				info += pVar->GivName() + " = " + pVar->GivValString();
+				info += pVar->GivName() + CBotString(" = ") + pVar->GivValString();
 				sep = ", ";
 				pVar = pVar->GivNext();
 			}
-- 
cgit v1.2.3-1-g7c22