* Makefile.in (ELCFILES): Remove ns-carbon-compat.elc.

* ns-carbon-compat.el: File removed.
* term/ns-win.el: Contents of ns-carbon-compat.el moved here.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac10d0ee1cc134d5c8aaaf41440432708d7bffd5..9edf3ae902c43a4e768e260b7271d2c63cf9a706 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-18  Chong Yidong  <cyd@stupidchicken.com>
+
+       * Makefile.in (ELCFILES): Remove ns-carbon-compat.elc.
+
+       * ns-carbon-compat.el: File removed.
+       * term/ns-win.el: Contents of ns-carbon-compat.el moved here.
+
 2008-07-18  Francesc Rocher  <rocher@member.fsf.org>
 
        * startup.el (fancy-splash-head): Fix change of 2008-07-02.