X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c03c730481bd2dc7bc857d9b4f1c41eea9bd495e..1399b26bc1e0aaa9f5e2a2671938c5e6b9437c79:/ChangeLog.1?ds=sidebyside

diff --git a/ChangeLog.1 b/ChangeLog.1
index 565c85bbcf..d1b8d0ffb9 100644
--- 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.