Commit Graph

9 Commits

Author SHA1 Message Date
Alex Roitman
d7ce524379 Merge from 2.0.1
svn: r4666
2005-05-24 13:08:06 +00:00
Alex Roitman
2a77676b36 Merge changes made in gramps20 into HEAD
svn: r4549
2005-05-11 14:04:47 +00:00
Alex Roitman
a7ca0ddf7f Merge changes made in gramps20 into HEAD
svn: r4431
2005-04-26 16:04:21 +00:00
Don Allingham
c987a9faff * src/ChooseParents.py: pychecker changes
* src/DdTargets.py: pychecker changes
* src/FamilyView.py: pychecker changes
* src/GrampsCfg.py: pychecker changes
* src/MergeData.py: pychecker changes
* src/MergePeople.py: pychecker changes
* src/NameEdit.py: pychecker changes
* src/NoteEdit.py: pychecker changes
* src/RelLib.py: pychecker changes
* src/gramps_main.py: pychecker changes


svn: r4327
2005-04-09 03:11:03 +00:00
Don Allingham
f99d6bd94c * src/MergePeople.py: provide more date in compare window, fix event
merging for families. Copy alternate names.


svn: r4260
2005-03-31 03:54:17 +00:00
Don Allingham
3cb21669f1 update
svn: r4259
2005-03-31 03:33:27 +00:00
Don Allingham
a47aacddfc * src/MergePeople.py: provide more date in compare window, fix event
merging for families.


svn: r4258
2005-03-31 03:30:16 +00:00
Don Allingham
97a3400d21 update
svn: r4255
2005-03-30 03:50:25 +00:00
Don Allingham
92d7132add * src/ReadXML.py: handle date object on names
* src/gramps.glade: add menu items for merging
* src/MergePeople.py: new person merge
* src/gramps_main.py: merge handling callbacks
* src/mergedata.glade: updated interface for merging

* src/SourceView.py: connect SourceView.merge into the multiple
selection mechanism


svn: r4254
2005-03-30 01:45:14 +00:00