merge from trunk

2 files changed, 5 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b4d1c2b67df..f08395ae24f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * lisp.mk (lisp): Add w32-common-fns.elc.
+
 2013-09-12  Xue Fuqiao  <xfq.free@gmail.com>
 
         * charset.c (char_charset): Document an exception for char-charset.
diff --git a/src/lisp.mk b/src/lisp.mk
index a9a661ea3a8..c12deebd893 100644
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -152,6 +152,7 @@ lisp = \
         $(lispsource)/term/w32-win.elc \
         $(lispsource)/ls-lisp.elc \
         $(lispsource)/disp-table.elc \
+        $(lispsource)/w32-common-fns.elc \
         $(lispsource)/dos-w32.elc \
         $(lispsource)/w32-fns.elc \
         $(lispsource)/dos-fns.elc \