Merge branch 'trunk' into xwidget

Conflicts:
	src/Makefile.in
	src/keyboard.c
	src/termhooks.h

2 files changed, 5 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e565983e147..e1025fc5f6b 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (mostlyclean): Remove *.res files.
+
 2013-05-18  Paul Eggert  <eggert@cs.ucla.edu>
 
         Port --enable-gcc-warnings to clang.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index e0acea867b7..f32333fe765 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -278,7 +278,7 @@ uninstall:
         fi
 
 mostlyclean:
-        -rm -f core *.o
+        -rm -f core *.o *.res
 
 clean: mostlyclean
         -rm -f ${EXE_FILES}