From: Joakim Verona <joakim@verona.se>
Date: Tue, 26 Mar 2013 14:31:46 +0000 (+0100)
Subject: conflict resolve
X-Git-Tag: emacs-25.0.90~2941
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e11705b616777a8a72363b2037d989987630e863;p=emacs.git

conflict resolve
---

e11705b616777a8a72363b2037d989987630e863
diff --cc lisp/emacs-lisp/cl-lib.el
index f3bf70b0190,f3bf70b0190..9bd7dacb4f7
--- a/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 8a9a43ac124,31de9714c65..93d65867fa7
--- a/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) \
 +   $(WEBKIT_LIBS) $(CLUTTER_LIBS) $(GIR_LIBS) \
-    $(LIB_EACCESS) $(LIB_TIMER_TIME) $(DBUS_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) \