summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@src.gnome.org>2007-04-12 23:57:21 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2007-04-12 23:57:21 +0000
commitc04189d8a9a876116e7816f17eaf05705e174e4b (patch)
treebe7e3fd46afa709a74a0855d3311a01c52c28ea7
parent2d5322ed986e46b8de2348fb282819bc399eb24a (diff)
downloadpango-1-14.tar.gz
svn path=/branches/pango-1-14/; revision=2226
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b50ac18b..add032fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,7 +63,6 @@
* Makefile.am (EXTRA_DIST): Include just pango-zip.sh.in in the
tarball, not pango-zip.sh.
->>>>>>> .r2207
2007-01-29 Behdad Esfahbod <behdad@gnome.org>
* === Released 1.14.10 ===