summaryrefslogtreecommitdiff
path: root/ChangeLog.pre-1.8
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog.pre-1.8')
-rw-r--r--ChangeLog.pre-1.88
1 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog.pre-1.8 b/ChangeLog.pre-1.8
index 6746f09..f98bf88 100644
--- a/ChangeLog.pre-1.8
+++ b/ChangeLog.pre-1.8
@@ -8306,7 +8306,7 @@ Date: Tue Apr 29 11:56:21 2008 +0100
4 files changed, 35 insertions(+), 57 deletions(-)
commit c57b1eca18db12b8d56d73093d5cae28ed388298
-Merge: b9acf62 cba1543
+Merge: b9acf62... cba1543...
Author: Søren Sandmann <sandmann@redhat.com>
Date: Fri Jun 13 16:18:13 2008 -0400
@@ -11082,7 +11082,7 @@ Date: Mon Apr 14 16:52:40 2008 -0700
1 files changed, 7 insertions(+), 6 deletions(-)
commit 9db764c732ef6e3405866a60762592625aa94ca4
-Merge: d96fdd5 44e6cdd
+Merge: d96fdd5... 44e6cdd...
Author: Carl Worth <cworth@cworth.org>
Date: Mon Apr 14 16:39:27 2008 -0700
@@ -11233,7 +11233,7 @@ Date: Fri Apr 11 13:48:38 2008 -0700
2 files changed, 10 insertions(+), 22 deletions(-)
commit 75001079c1c6361f116409dc13263e87081637d1
-Merge: a5770c3 f57100a
+Merge: a5770c3... f57100a...
Author: Carl Worth <cworth@cworth.org>
Date: Fri Apr 11 10:08:14 2008 -0700
@@ -11480,7 +11480,7 @@ Date: Fri Apr 11 21:42:19 2008 +0930
1 files changed, 5 insertions(+), 4 deletions(-)
commit 0ac8130ae3d74a09343f4b9a2d69f938910b4ab9
-Merge: eac9251 11299ae
+Merge: eac9251... 11299ae...
Author: Carl Worth <cworth@cworth.org>
Date: Thu Apr 10 18:07:12 2008 -0700