* lisp/net/tramp-gvfs.el (tramp-gvfs-mount-spec): Fix typo.

[gnu-emacs] / ChangeLog.1

diff --git a/ChangeLog.1 b/ChangeLog.1
index 565c85bbcf1cf6be379b410cdb6fea5ee7f01d65..dee582f47b2fc04b814681d6dcfa4d937cdf5c64 100644 (file)
--- a/ChangeLog.1
+++ b/ChangeLog.1
@@ -1,23 +1,9 @@
-2015-04-11  Jan Djärv  <jan.h.d@swipnet.se>
-
-       * configure.ac: Allow jpeg with cairo.
-       Allow tiff and gif with cairo.
-
 2015-04-07  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib
        * lib/stddef.in.h: Update from gnulib, incorporating:
        2015-04-02 stddef: port to pre-C11 GCC on x86
 
-2015-04-05  Jan Djärv  <jan.h.d@swipnet.se>
-
-       * configure.ac: Allow rsvg with cairo.  Move back HAVE_RSVG.
-
-2015-04-03  Jan Djärv  <jan.h.d@swipnet.se>
-
-       * configure.ac (HAVE_RSVG): Move after cairo.
-       (USE_CAIRO): Disable rsvg, don't disable Xpm.
-
 2015-04-03  Paul Eggert  <eggert@cs.ucla.edu>
 
        Port 'configure' to clang 3.5
@@ -122,13 +108,6 @@
        * configure.ac: Set locallisppath to empty for NS self contained,
        unless --enable-loadllisppath was given (Bug#19850).
 
-2015-02-11  Jan Djärv  <jan.h.d@swipnet.se>
-
-       * configure.ac (with-cairo): New option.
-       (USE_CAIRO): Default to yes for Gtk+ 3.  Add code to test for cairo,
-       set CAIRO_CFLAGS, CAIRO_LIBS.  Add ftcrfonto to FONT_OBJ if cairo.
-       Output "Does Emacs use cairo?".
-
 2015-02-09  Paul Eggert  <eggert@cs.ucla.edu>
 
        * configure.ac (HAVE_LIBXML2): Add missing comma.
@@ -14721,7 +14700,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2015 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2016 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.