2059: need a way to compare and merge all objects, by MD Nauta

svn: r15645
2010-07-22 02:16:32 +00:00
parent 59403835fe
commit 3e28ee67ec
67 changed files with 7835 additions and 109 deletions
--- a/src/images/16x16/Makefile.am
+++ b/src/images/16x16/Makefile.am
@@ -34,6 +34,7 @@ dist_pkgdata_DATA = \
 	gramps-gramplet.png \
 	gramps-lock.png \
 	gramps-media.png \
+	gramps-merge.png \
 	gramps-notes.png \
 	gramps-parents.png \
 	gramps-parents-add.png \
--- a/src/images/22x22/Makefile.am
+++ b/src/images/22x22/Makefile.am
@@ -34,6 +34,7 @@ dist_pkgdata_DATA = \
 	gramps-gramplet.png \
 	gramps-lock.png \
 	gramps-media.png \
+	gramps-merge.png \
 	gramps-notes.png \
 	gramps-parents.png \
 	gramps-parents-add.png \
--- a/src/images/48x48/Makefile.am
+++ b/src/images/48x48/Makefile.am
@@ -34,6 +34,7 @@ dist_pkgdata_DATA = \
 	gramps-gramplet.png \
 	gramps-lock.png \
 	gramps-media.png \
+	gramps-merge.png \
 	gramps-notes.png \
 	gramps-parents.png \
 	gramps-parents-add.png \