From 5f95b528f213899994d58154226d02daaa38bf99 Mon Sep 17 00:00:00 2001
From: Dennis Schridde <devurandom@gna.org>
Date: Fri, 14 Nov 2008 15:39:44 +0000
Subject: [PATCH] Update ChangeLog with r6267 and r6280

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6293 4a71c877-e1ca-e34f-864e-861f7616d084
---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2e7e09904..afa9a1a47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
    * Fix: Should fix flickering background on loading screen.
    * Fix: --nosound works correctly with videos now.
    * Fix: Clean up input stream after saving a save game, to prevent it from going into chat mode.
+ * AI:
+   * Fix: Allow a droid to pick a new target while auto-repairing. (ticket:35, bug #12217)
+ * Buildsystem:
+   * Fix: Only compile the translations when $(TRANSLATION) is "yes". (ticket:130)
 
 2008-11-09: Version 2.1_rc1
  * General: