From 2f4d1ae2cbaec7f7566b342b22a909f6ec70c1ec Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 17 May 2004 03:00:48 +0000 Subject: [PATCH] update svn: r3176 --- ChangeLog | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49a69e62e..6062fded2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -803,15 +803,10 @@ * doc/gramps-manual/fr/figures/*.png: Update figures. 2004-01-31 Don Allingham -<<<<<<< ChangeLog -<<<<<<< ChangeLog * src/PeopleView.py (PeopleView.add_to_person_list): don't attempt to sort the model unless it has be assigned. -======= -======= * src/SourceView.py: handle column sorting properly * src/PlaceView.py: handle column sorting properly ->>>>>>> 1.658 * src/gramps_main.py: better error messages on database write failure * src/WriteXML.py: better error messages on database write failure * src/GrampsXML.py: better error messages on database write failure @@ -835,7 +830,6 @@ 2004-01-31 Don Allingham * src/PeopleView.py (PeopleView.add_to_person_list): don't attempt to sort the model unless it has be assigned. ->>>>>>> 1.655 * src/TransTable.py: make sure returned valued is in unicode format * src/plugins/Ancestors.py: fix InverseNameTypesMap problem * src/plugins/IndivComplete.py: fix InverseNameTypesMap problem.