* src/DataViews/_PersonView.py: Merge module support

* src/Merge/_MergeSource.py: broken out of MergeData.py
	* src/Merge/__init__.py: support of module
	* src/Merge/Makefile.am: added
	* src/Merge/_MergePlace.py: broken out of MergeData.py
	* src/Merge/_MergePerson.py: renamed


svn: r6778
This commit is contained in:
Don Allingham
2006-05-25 21:02:49 +00:00
parent d5f33362ac
commit 305b3d7bd1
9 changed files with 191 additions and 137 deletions

View File

@@ -210,6 +210,6 @@ class SourceView(PageView.ListView):
"control key while clicking on the desired source.")
ErrorDialog(msg,msg2)
else:
import MergeData
MergeData.MergeSources(self.dbstate, self.uistate, mlist[0], mlist[1])
import Merge
Merge.MergeSources(self.dbstate, self.uistate, mlist[0], mlist[1])