From 6b7ed2cbc460ec071183d18e70dbd6829f206ac8 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Fri, 26 May 2006 00:10:59 +0000
Subject: [PATCH] 2006-05-25  Don Allingham  <don@gramps-project.org> 	*
 configure.in: add Merge directory

svn: r6782
---
 ChangeLog    | 3 +++
 configure.in | 1 +
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 379656c22..6b538ae2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-05-25  Don Allingham  <don@gramps-project.org>
+	* configure.in: add Merge directory
+
 2006-05-25  Alex Roitman  <shura@gramps-project.org>
 	* src/plugins/Verify.py: More rework, still in progress.
 
diff --git a/configure.in b/configure.in
index 0f5d97932..f64c41299 100644
--- a/configure.in
+++ b/configure.in
@@ -201,6 +201,7 @@ src/Selectors/Makefile
 src/GrampsLogger/Makefile
 src/TreeViews/Makefile
 src/GrampsDb/Makefile
+src/Merge/Makefile
 src/docgen/Makefile
 src/Models/Makefile
 src/Editors/Makefile