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/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CBot/CMakeLists.txt')

diff --git a/src/CBot/CMakeLists.txt b/src/CBot/CMakeLists.txt
index 409ef3b..9933e9c 100644
--- a/src/CBot/CMakeLists.txt
+++ b/src/CBot/CMakeLists.txt
@@ -10,6 +10,7 @@ CBotToken.cpp
 CBotTwoOpExpr.cpp
 CBotVar.cpp
 CBotWhile.cpp
+CBot.rc
 )
 
 add_library(CBot SHARED ${SOURCES})
-- 
cgit v1.2.3-1-g7c22