aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-09-13 18:40:15 +0800
committerChristian Persch <chpe@src.gnome.org>2004-09-13 18:40:15 +0800
commit4857adf35d8377e6a1890de18edbc8cbdc50abb5 (patch)
treedbdd67fa5e7f934878e072cb1213cee74916917f
parent2606279995f614634062e0aeb9833c482db5d083 (diff)
downloadgsoc2013-epiphany-4857adf35d8377e6a1890de18edbc8cbdc50abb5.tar
gsoc2013-epiphany-4857adf35d8377e6a1890de18edbc8cbdc50abb5.tar.gz
gsoc2013-epiphany-4857adf35d8377e6a1890de18edbc8cbdc50abb5.tar.bz2
gsoc2013-epiphany-4857adf35d8377e6a1890de18edbc8cbdc50abb5.tar.lz
gsoc2013-epiphany-4857adf35d8377e6a1890de18edbc8cbdc50abb5.tar.xz
gsoc2013-epiphany-4857adf35d8377e6a1890de18edbc8cbdc50abb5.tar.zst
gsoc2013-epiphany-4857adf35d8377e6a1890de18edbc8cbdc50abb5.zip
Add ChangeLog-20040912 to EXTRA_DIST.
2004-09-13 Christian Persch <chpe@cvs.gnome.org> * Makefile.am: Add ChangeLog-20040912 to EXTRA_DIST.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 97248b60e..dcbcb5722 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-09-13 Christian Persch <chpe@cvs.gnome.org>
+ * Makefile.am:
+
+ Add ChangeLog-20040912 to EXTRA_DIST.
+
+2004-09-13 Christian Persch <chpe@cvs.gnome.org>
+
Merging pre-gnome-2-10 branch to HEAD.
Splitting ChangeLog.
diff --git a/Makefile.am b/Makefile.am
index 157ced756..a49482fbd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,8 @@ EXTRA_DIST = \
omf.make \
COPYING.README \
MAINTAINERS \
- ChangeLog-20030925
+ ChangeLog-20030925 \
+ ChangeLog-20040912
DISTCLEANFILES = \
intltool-extract \