Remove dead code

[andy/viking.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 22c726eb677c998f6eaa55e5f5ecbc907f05dc2a..a808a7f2917fc086190e4f6d4dbb0462a02999f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-02-08
+Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
+       * Update translations
+       * Release 0.9.8
+
+2009-01-22
+Mathieu Albinet <mathieu17@gmail.com>:
+       * Fix loading of world map file
+
+2009-01-22
+Rob Norris <robbieonsea@users.sourceforge.net>:
+       * Fix 2249398: Fix some memory leaks
+
 2009-01-18
 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
        * configure.ac: allow to enable/disable geonames and select the search method
@@ -133,6 +146,7 @@ Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
 Quy Tonthat <qtonthat@gmail.com>:
        * fix parallel build (make -j8) on multi-processor machines. Based
        on a patch from sbrabec. Thanks.
+>>>>>>> viking-0.9.7:ChangeLog
 
 2008-09-03
 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: