added to changelog

[livewp] / applet / debian / changelog

diff --git a/applet/debian/changelog b/applet/debian/changelog
index 51c77a9..b0f569b 100644 (file)
--- a/applet/debian/changelog
+++ b/applet/debian/changelog
@@ -1,4 +1,15 @@
-<<<<<<< HEAD
+live-wallpaper (0.9) unstable; urgency=low
+
+  * Added theme Conky 
+  * Added theme Colorflood 
+  * Added theme CrazyChickens 
+  * Added theme Fifteen (Thanks Andrew Zhilin aka wazd for design)
+  * Added theme Liqflow 
+  * Added Italian translation (Thanks Emanuele Cassioli) 
+  * Updated Russian, Finish, Spain translations
+
+ -- Vlad Vasiliev <vlad@gas.by>  Tue, 07 Sep 2010 18:59:10 +0200
+
 live-wallpaper (0.8.5) unstable; urgency=low
 
   * Fixed number version in dialog "About" 
@@ -17,8 +28,6 @@ live-wallpaper (0.8.3) unstable; urgency=low
 
  -- Vlad Vasiliev <vlad@gas.by>  Sun, 22 Aug 2010 18:39:10 +0200
 
-=======
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 live-wallpaper (0.8.2) unstable; urgency=low
 
   * Updated Finish and Russian translation