diff options
| author | Adam Endrodi <ext-adam.endrodi@nokia.com> | 2010-12-20 14:31:17 +0200 |
|---|---|---|
| committer | Adam Endrodi <ext-adam.endrodi@nokia.com> | 2010-12-21 13:53:39 +0200 |
| commit | a46933b462a751ef1b12f265d730049e6a4f5359 (patch) | |
| tree | 18b9539a4dd6b97bf2016d45e29c41abf8c8d3a2 | |
| parent | 91189ef98f455c5a5ef45383eca666d371bced07 (diff) | |
changelog corrected
| -rw-r--r-- | debian/changelog | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 247ebc0..def4c8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ mcompositor (0.8.1-1) unstable; urgency=low -<<<<<<< HEAD:debian/changelog * Fixes: NB#207977 - Select connection dialog is not opened on display in certain s ituation * Remove old dock code and obsolete _DUI_STATUSBAR_OVERLAY * MCompositeManagerPrivate::addItem(): use property cache to get the window type @@ -28,11 +27,6 @@ mcompositor (0.8.1-1) unstable; urgency=low * facility to trace window sizing -- Adam Endrodi <ext-adam.endrodi@nokia.com> Mon, 20 Dec 2010 14:25:36 +0200 -======= - * unreleased - - -- Adam Endrodi <ext-adam.endrodi@nokia.com> Wed, 08 Dec 2010 15:01:17 +0200 ->>>>>>> cadf5c731433726e3d641e4d0720ee138e886cb5:debian/changelog mcompositor (0.8.0-2) unstable; urgency=low |