conflict resolve

diff --cc configure.ac
Simple merge

diff --cc lisp/emacs-lisp/cl-lib.el
index f3bf70b019068b54b3d80af8f30d3ee8222b82e3,f3bf70b019068b54b3d80af8f30d3ee8222b82e3..9bd7dacb4f7139ea97e0b77b692553fdc561667d
--- 1/lisp/emacs-lisp/cl-lib.el
--- 2/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@@ -3,7 -3,7 +3,7 @@@
  ;; Copyright (C) 1993, 2001-2013 Free Software Foundation, Inc.
  
  ;; Author: Dave Gillespie <daveg@synaptics.com>
--;; Version: 1.0
++;; Version: 2.02
  ;; Keywords: extensions
  
  ;; This file is part of GNU Emacs.

diff --cc src/Makefile.in
index 8a9a43ac124b157c0a07d3995c3c1c4cc2d86bcb,31de9714c65e90145bddb49f510d51c116dafd18..93d65867fa782fb8d96e592b3d1ab12058b5b52b
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -403,8 -392,7 +404,8 @@@ ALLOBJS = $(VMLIMIT_OBJ) $(obj) $(other
  LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
     $(LIBX_OTHER) $(LIBSOUND) \
     $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \
-    $(LIB_EACCESS) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
 +   $(WEBKIT_LIBS) $(CLUTTER_LIBS) $(GIR_LIBS) \
+    $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
     $(LIB_EXECINFO) \
     $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
     $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge