Merge from trunk.

3 files changed, 7 insertions, 0 deletions

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 5309671651b..2dbccf9be39 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-20  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (OTHERS):
+        * makefile.w32-in (MISC): Add ipa-praat.elc.
+
 2011-07-23  Yair F  <yair.f.lists@gmail.com>
 
         * quail/hebrew.el ("hebrew"): Additional key mappings.
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 18eb8b62a96..87020616a57 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -124,6 +124,7 @@ OTHERS= \
         ${srcdir}/quail/arabic.elc \
         ${srcdir}/quail/ethiopic.elc \
         ${srcdir}/quail/ipa.elc \
+        ${srcdir}/quail/ipa-praat.elc \
         ${srcdir}/quail/hebrew.elc \
         ${srcdir}/quail/georgian.elc \
         $(srcdir)/quail/persian.elc \
diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 1ab14c72b3d..231384308f2 100644
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -118,6 +118,7 @@ MISC= \
         $(srcdir)/quail/arabic.elc \
         $(srcdir)/quail/ethiopic.elc \
         $(srcdir)/quail/ipa.elc \
+        $(srcdir)/quail/ipa-praat.elc \
         $(srcdir)/quail/hebrew.elc \
         $(srcdir)/quail/georgian.elc \
         $(srcdir)/quail/persian.elc \