1 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 437e2082..4836b1f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Aug 15 16:18:22 CEST 2011
+        Merging gnunet-setup and gnunet-gtk projects.
+Mon Jul 11 17:21:05 CEST 2011
+        Releasing gnunet-setup 0.9.0pre3.
+        With this release we will finally start with
+        a detailed accounting of changes in the ChangeLog.
+Mon Nov  1 13:03:59 CET 2010
+        gnunet-setup started.
 Fri Jun 10 11:07:58 CEST 2011
        Releasing gnunet-gtk 0.9.0pre3.  Instead of listing all that has
        changed, here is the short list of what is known NOT to work:

diff --git a/ChangeLog b/ChangeLog index 437e2082..4836b1f7 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -1,3 +1,15 @@
		1	Mon Aug 15 16:18:22 CEST 2011
		2	Merging gnunet-setup and gnunet-gtk projects.
		3
		4	Mon Jul 11 17:21:05 CEST 2011
		5	Releasing gnunet-setup 0.9.0pre3.
		6
		7	With this release we will finally start with
		8	a detailed accounting of changes in the ChangeLog.
		9
		10	Mon Nov 1 13:03:59 CET 2010
		11	gnunet-setup started.
		12
1	Fri Jun 10 11:07:58 CEST 2011	13	Fri Jun 10 11:07:58 CEST 2011
2	Releasing gnunet-gtk 0.9.0pre3. Instead of listing all that has	14	Releasing gnunet-gtk 0.9.0pre3. Instead of listing all that has
3	changed, here is the short list of what is known NOT to work:	15	changed, here is the short list of what is known NOT to work: