--- trunk/debian/changelog	2008/12/10 00:00:05	2
+++ branches/ports/maemo/debian/changelog	2009/02/08 22:52:48	63
@@ -1,7 +1,49 @@
+osm2go (0.6.12-maemo1) unstable; urgency=low
+
+  * Merge trunk, and begin building in the new way.
+  * Version prefix/suffix parser merged from branches/ports/debian.
+
+ -- Andrew Chadwick <andrewc@piffle.org>  Sun, 08 Feb 2009 22:34:12 +0000
+
+osm2go (0.6-11) unstable; urgency=low
+
+  * New presets.xml
+  * Handling of <optional> element <andrewc@piffle.org>
+  * Handling of new <link> element
+  * Handling of mew <space> element
+
+ -- Till Harbaum <till@harbaum.org>  Thu, 05 Feb 2009 20:48:09 +0100
+
+osm2go (0.6-10) unstable; urgency=low
+
+  * Use hash tables to find nodes and ways faster via their ids
+  * Some minor gtk handling/warning fixes
+	
+ -- Till Harbaum <till@harbaum.org>  Wed, 21 Jan 2009 19:24:22 +0100
+
+osm2go (0.6-9) unstable; urgency=low
+
+  * Beta version of quick'n dirty xml parser (qnd_xml)
+
+ -- Till Harbaum <harbaum@metis>  Fri, 16 Jan 2009 20:44:58 +0100
+
+osm2go (0.6-8) unstable; urgency=low
+
+  * Unified internal color model <till@harbaum.org>
+  * Fixed crash when changing projects while using GPS <andrewc@piffle.org>
+  * Option to disable antialiasing <till@harbaum.org>
+  * Rendering of "bridges" <till@harbaum.org>
+	
+ -- Till Harbaum <till@harbaum.org>  Wed, 17 Dec 2008 20:02:24 +0100
+
 osm2go (0.6-7) unstable; urgency=low
 
   * Changed directory layout for SVN import
-
+  * Asynchronous network io
+  * Global and more flexible WMS server settings
+  * Global option to disable icons unless the n810 issue is solved
+  * Support for dashed lines and line mods
+	
  -- Till Harbaum <harbaum@metis>  Tue, 09 Dec 2008 20:47:45 +0100
 
 osm2go (0.6-6) unstable; urgency=low