From d50d45360aae0e0d5c40edb794ad5ee472946327e050d51d6a3628f2267ba6d2 Mon Sep 17 00:00:00 2001
From: Uwe Drechsel <vym@insilmaril.de>
Date: Mon, 21 Feb 2011 10:47:59 +0000
Subject: [PATCH] Fixed conflicting changelog

OBS-URL: https://build.opensuse.org/package/show/editors/vym?expand=0&rev=14
---
 vym.changes | 261 +++++++++-------------------------------------------
 1 file changed, 42 insertions(+), 219 deletions(-)

diff --git a/vym.changes b/vym.changes
index 5cef8ce..63b4bdb 100644
--- a/vym.changes
+++ b/vym.changes
@@ -60,239 +60,62 @@ Fri Dec  3 11:58:03 CET 2010 - uwedr@suse.de
 - Bugfix: Glob patterns in mime type file (KDE bug #257980)
 
 -------------------------------------------------------------------
-Wed Apr  7 12:01:25 CEST 2010 - vym@insilmaril.de
+Thu Oct 14 12:19:59 CEST 2010 - uwedr@suse.de
 
-- Version: 1.13.2   
-- Bugfix: Segfault when removing a map
-- Bugfix: Fixed regression in HTML export, which could lead to dataloss
-          (not unhiding branches which are hidden during export)
+- Version: 1.12.8
+- Feature: Spanish translation by David Amian
+
+-------------------------------------------------------------------
+Fri Mar 05 19:34:51 CET 2010 - taggm@diminutia.us
+
+- Version: 1.12.7
+- Feature: Changes for windows version
+
+-------------------------------------------------------------------
+Mon Nov 30 19:34:51 CET 2009 - vym@insilmaril.de
+
+- Version: 1.12.6
+- Bugfix: Selection rectangle not always shown, forcing update of
+          QGraphicsScene now.
 		  
 -------------------------------------------------------------------
-Tue Mar 30 19:29:43 CEST 2010 - vym@insilmaril.de
+Mon Nov 16 10:03:52 CET 2009 - vym@insilmaril.de
 
-- Bugfix: Much improved overview of search results, now also for notes
+- Version: 1.12.5
+- Bugfix: Crash after switching back to a map, where the mapcenter
+          had been deleted and restored with undo.
 
 -------------------------------------------------------------------
-Tue Mar 23 22:36:19 CET 2010 - vym@insilmaril.de
-
-- Feature: Added commandline options to list keyboard shortcuts
-- Bugfix: (Regression) Scrolling with PageUp/Down disabled, moving
-          branches instead
-- Bugfix: update scene after load, required user interaction before
--------------------------------------------------------------------
-Mon Mar 22 08:37:42 CET 2010 - vym@insilmaril.de
-
-- Bugfix: Segfault when undoing deleting of MapCenter
-- Bugfix: Workaround for Qt bug, where cursor of embedded QLineEdits
-          in 2nd tab was not shown
-- Bugfix: Icon of TreeEditor now shows correct state
-
--------------------------------------------------------------------
-Thu Mar 18 12:45:45 CET 2010 - vym@insilmaril.de
-
-- Version: 1.13.1   First pre-release of 1.13.0 to buildservice
-
--------------------------------------------------------------------
-Wed Mar 17 22:24:51 CET 2010 - vym@insilmaril.de
-
-- Bugfix: Enabled Qt 4.6: Removed QtAnimation Framework and fixed flags
-
--------------------------------------------------------------------
-Tue Mar 16 16:45:23 CET 2010 - vym@insilmaril.de
-
-- Feature: zoomFactor is saved and restored on load
-
--------------------------------------------------------------------
-Mon Mar 15 12:48:45 CET 2010 - vym@insilmaril.de
-
-- Bugfix: Several fixes for later autoLayout
-
--------------------------------------------------------------------
-Wed Mar 10 16:35:23 CET 2010 - vym@insilmaril.de
-
-- Bugfix: MainWindow::getModel() returns correct model now
-- Bugfix: Better focus handling in FindWidget
-
--------------------------------------------------------------------
-Tue Mar  9 14:04:10 CET 2010 - vym@insilmaril.de
-
-- Bugfix: Regression in scrolling branches
-
--------------------------------------------------------------------
-Mon Mar  8 07:45:34 CET 2010 - vym@insilmaril.de
-
-- Feature: New widget to display all results of Find action.
-           Also opened with CTRL-F once FindWidget is open
-- Feature: loadNote and saveNote commands to allow changing of note 
-           from external
-
--------------------------------------------------------------------
-Fri Feb 19 08:05:02 CET 2010 - vym@insilmaril.de
-
-- Bugfix: Fixed regression of flags
-
--------------------------------------------------------------------
-Wed Feb 17 16:31:34 CET 2010 - vym@insilmaril.de
-
-- Bugfix: When pasting a heading into the LineEdit, newlines are removed
-          to avoid broken rendering
-
--------------------------------------------------------------------
-Wed Feb 17 11:49:09 CET 2010 - vym@insilmaril.de
-
-- Feature: Novell Bugzilla now has extra flag
-
--------------------------------------------------------------------
-Wed Feb 10 14:47:49 CET 2010 - vym@insilmaril.de
-
-- Feature: Sort lexically backwards
-
--------------------------------------------------------------------
-Tue Feb  9 10:26:23 CET 2010 - vym@insilmaril.de
-
-- Bugfix: Relinking now keeps frametype 
-
--------------------------------------------------------------------
-Thu Jan 21 09:22:08 CET 2010 - vym@insilmaril.de
-
-- Bugfix: Changes in NoteEditor update the Save flag visually
-
--------------------------------------------------------------------
-Wed Jan 20 14:28:20 CET 2010 - vym@insilmaril.de
-
-- Bugfix: New Progressbar while loading maps: One bar to count them,
-          one bar to into colors grind them 
-
--------------------------------------------------------------------
-Thu Jan 14 12:03:43 CET 2010 - vym@insilmaril.de
-
-- Feature: Very basic support to find duplicate URLs
-
--------------------------------------------------------------------
-Wed Jan 13 08:28:18 CET 2010 - vym@insilmaril.de
-
-- Feature: Added action to open all URLs in subtree, default
-           is now to only open those, which don't have scrolled parent
-
--------------------------------------------------------------------
-Tue Jan 12 09:14:49 CET 2010 - vym@insilmaril.de
-
-- Bugfix: Restart a konqueror ofr opening of URLs, if needed 
-
--------------------------------------------------------------------
-Tue Jan  5 12:22:27 CET 2010 - vym@insilmaril.de
-
-- Bugfix: Dropping URLs
-
--------------------------------------------------------------------
-Mon Jan  4 09:36:24 CET 2010 - vym@insilmaril.de
-
-- Bugfix: Branch didn't unscroll when deleting last child
-- Feature: URL icons in image map of HTML export work now
-
--------------------------------------------------------------------
-Tue Dec 15 10:14:11 CET 2009 - vym@insilmaril.de
-
-- Bugfix: A&O report didn't show subitems
-
--------------------------------------------------------------------
-Mon Dec 14 11:16:57 CET 2009 - vym@insilmaril.de
-
-- Bugfix: Wrong tmp position when relinking a mainbranch
-- Bugfix: Image export, also used in HTML export
-
--------------------------------------------------------------------
-Thu Dec  7 23:17:57 CET 2009 - vym@insilmaril.de
-
-- Feature: Following xLinks is now possible by clicking in the 
-           part of a branch near to beginning of branch (20 pixels)
-- Feature: Added new flag for status "work in progress" 
-           (between green hook and red cross)
-- Bugfix: Animation of branches (default off in MapEditor)
-- Bugfix: Segfault when closing map (due clearing selection in
-          VymModel::clear()  )
-
--------------------------------------------------------------------
-Thu Dec  3 17:26:59 CET 2009 - vym@insilmaril.de
-
-- Bugfix: Clicking the note flag opens the note editor again
-
--------------------------------------------------------------------
-Tue Dec  1 12:03:42 CET 2009 - vym@insilmaril.de
-
-- Bugfix: Undo of detach
-
--------------------------------------------------------------------
-Thu Nov 26 22:32:34 CET 2009 - vym@insilmaril.de
-
-- Bugfix: Regression in Undo
-- Bugfix: Find didn't find stuff in previous part of tree
-
--------------------------------------------------------------------
-Tue Nov 24 22:34:42 CET 2009 - vym@insilmaril.de
-
-- Bugfix: Automatic scrolling to new selected items didn't work 
-          reliable when item had scrolled parents
-
--------------------------------------------------------------------
-Wed Nov 11 10:32:29 CET 2009 - vym@insilmaril.de
-
-- Bugfix: New map has mapcenter again
-
--------------------------------------------------------------------
-Tue Nov 10 13:53:37 CET 2009 - vym@insilmaril.de
-
-- Bugfix: Autodetection of textformat (ASCII vs. HTML)
-- Bugfix: nextBranch failed with xLinks
-
--------------------------------------------------------------------
-Fri Oct 30 18:58:22 CET 2009 - uwedr@suse.de
-
-- Bugfix: Selection doesn't get lost when switching maps
-
--------------------------------------------------------------------
-Wed Oct 28 08:43:34 CET 2009 - uwedr@suse.de
-
-- Feature: Adding timestamp to branch
-
--------------------------------------------------------------------
-Wed Oct 21 17:23:13 CEST 2009 - uwedr@suse.de
-
-- Feature: expand/collapse by one level in TreeEditor 
-- Bugfix: Process like webbrowser started by vym survive vym now
-
--------------------------------------------------------------------
-Tue Oct  6 16:29:07 CEST 2009 - uwedr@suse.de
-
-- Bugfix: Export to OpenOffice.org
-- Bugfix: BranchProp window
-
--------------------------------------------------------------------
-Sat Aug  8 23:54:38 CEST 2009 - uwedr@suse.de
-
-- Feature: Selecting with cursor now remembers left & right of
-  mapcenters. Also improved selections in deeper trees
-- Bugfix: Selecting with cursor in MapEditor
-
--------------------------------------------------------------------
-Thu Aug  6 19:33:01 CEST 2009 - uwedr@suse.de
+Thu Aug  6 19:32:20 CEST 2009 - vym@insilmaril.de
 
 - Bugfix: Removed the "new" in new branches to allow easier copy & paste
 
 -------------------------------------------------------------------
-Wed Jul 22 21:51:04 CEST 2009 - uwedr@suse.de
+Tue Aug  4 14:47:41 CEST 2009 - uwedr@suse.de
 
-- Bugfix: relinking a branch to a scrolled branch doesn't unscroll
-          anymore
-- Bugfix: Importing KDE bookmarks with empty folders doesn't
-          scroll these folders anymore
+- Bugfix: Improved Bugzilla URL handling
 
 -------------------------------------------------------------------
-Wed Jul 16 13:47:01 CEST 2009 - uwedr@suse.de
+Wed Jul 29 17:31:16 CEST 2009 - uwedr@suse.de
 
-- Version: 1.13.0 
-- Bugfix: Deleting an animated part no longer segfaults 
+- Version: 1.12.4
+- Bugfix: No undo for deleted mapCenters.
 
+-------------------------------------------------------------------
+Fri Jul 24 10:50:50 CEST 2009 - uwedr@suse.de
+
+- Version: 1.12.3
+- Note: Re-release of 1.12.2i to bump release number in tarball on
+        community request
+
+-------------------------------------------------------------------
+Wed Jul 22 21:51:04 CEST 2009 - uwedr@suse.de
+
+- Version: 1.12.2i
+- Bugfix: relinking a branch to a scrolled branch doesn't unscroll
+          anymore
+- Bugfix: Importing KDE bookmarks with empty folders doesn't scroll
+          these folders anymore
 -------------------------------------------------------------------
 Wed Apr  8 13:54:05 CEST 2009 - uwedr@suse.de
 
@@ -310,7 +133,7 @@ Thu Apr  2 11:56:36 CEST 2009 - uwedr@suse.de
 - Feature: Added sverige translation 
 
 -------------------------------------------------------------------
-Mon Mar 30 09:07:19 CEST 2009 - uwedr@suse.de
+Mon Mar 30 09:07:19 CEST 2009 - uwe
 
 - Version: 1.12.2g
 - Bugfix: (Regression in 1.12.2f) Export Bookmarks to KDE 3