From 1982a88d5c856b266a3d80e9f85f800abbe3af32 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Fri, 26 Jun 2015 06:52:34 +0200
Subject: [PATCH] Fix ChangeLog file.

Correct result of `git pull -r'.
---
 ChangeLog | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f54cec317..dac08b700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,3 @@
-2015-06-24  Alexei Podtelezhnikov <apodtele@gmail.com>
-
-	* src/bdf/bdflib.c (_bdf_parse_start): Disallow 0 bpp.
-
-2015-06-24  Alexei Podtelezhnikov <apodtele@gmail.com>
-
-	* src/bdf/bdflib.c (_bdf_parse_start): Simplify bpp parsing.
-
 2015-06-26  Werner Lemberg  <wl@gnu.org>
 
 	* CMakeLists.txt: Select platform-dependend `ftdebug.c'.
@@ -65,6 +57,14 @@
 
 	* docs/*: Updated.
 
+2015-06-24  Alexei Podtelezhnikov <apodtele@gmail.com>
+
+	* src/bdf/bdflib.c (_bdf_parse_start): Disallow 0 bpp.
+
+2015-06-24  Alexei Podtelezhnikov <apodtele@gmail.com>
+
+	* src/bdf/bdflib.c (_bdf_parse_start): Simplify bpp parsing.
+
 2015-06-23  Werner Lemberg  <wl@gnu.org>
 
 	s/TYPEOF/FT_TYPEOF/ (#45376).