Merge changes from gramps20 made since 2.0.5

svn: r5105
2005-08-18 05:58:28 +00:00
parent b9f4134fdd
commit 704e0c4787
111 changed files with 31121 additions and 20132 deletions
--- a/src/MediaView.py
+++ b/src/MediaView.py
@ -172,4 +172,3 @@ class MediaView(PageView.ListView):
            import NoteEdit
            NoteEdit.NoteEditor(obj,self.parent,self.topWindow,
                                self.note_callback)
-