* src/plugins/Merge.py: Rename, because Merge module shadows this

plugin module.
	* src/plugins/FindDupes.py: New module, to replace Merge.py;
	(ShowMatches.on_do_merge_clicked): Use new Merge component.


svn: r7096
This commit is contained in:
Alex Roitman
2006-07-30 21:29:25 +00:00
parent b396db04c6
commit ada625adff
2 changed files with 6 additions and 2 deletions

View File

@@ -1,4 +1,8 @@
2006-07-30 Alex Roitman <shura@gramps-project.org>
* src/plugins/Merge.py: Rename, because Merge module shadows this
plugin module.
* src/plugins/FindDupes.py: New module, to replace Merge.py;
(ShowMatches.on_do_merge_clicked): Use new Merge component.
* src/ViewManager.py (ViewManager.do_load_plugins): Catch exception;
(ViewManager.plugin_status): Catch exception.