From f716b5e9b60d37bbbc83c20906e2dfe3bf203577 Mon Sep 17 00:00:00 2001
From: Steve Zesch <stevezesch2@gmail.com>
Date: Tue, 10 Jul 2012 21:55:31 -0400
Subject: Preparing for 1.4 release.

---
 ChangeLog | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index db06c78f..d48a283d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+commit 97dbdf6c937f1221e7fc35e8f658bd07c9aa001b
+Merge: 4ac3c7f e72f974
+Author: Stefano Karapetsas <stefano@karapetsas.com>
+Date:   Fri Jul 6 00:52:03 2012 -0700
+
+    Merge pull request #30 from Gymnasiast/master
+    
+    Fix for clock in mate-panel skipping seconds
+
+commit 4ac3c7f9f81501f753c31962407280481477fc20
+Author: Steve Zesch <stevezesch2@gmail.com>
+Date:   Thu Jul 5 14:26:19 2012 -0400
+
+    Preparing for 1.4 release.
+
+ ChangeLog    | 1316 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ configure.ac |    2 +-
+ 2 files changed, 1315 insertions(+), 3 deletions(-)
+
 commit 1a88770385c3b71a423ee7ee620a252e0d6e8908
 Author: Stefano Karapetsas <stefano@karapetsas.com>
 Date:   Wed Jul 4 16:25:18 2012 +0200
@@ -31,6 +50,15 @@ Date:   Wed Jul 4 16:12:47 2012 +0200
  po/gnome-copyrights.txt | 1443 +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 1443 insertions(+)
 
+commit e72f97458561206f5b2732919dc37ca81ba2ed92
+Author: Michael Steenbeek <michael@AUGUSTUS.(none)>
+Date:   Mon Jun 25 11:20:52 2012 +0200
+
+    Fix clock seconds
+
+ applets/clock/clock.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 commit 765098c3b9d988f4ae690eebd38e559352fa5320
 Author: Stefano Karapetsas <stefano@karapetsas.com>
 Date:   Wed Jun 20 12:55:14 2012 +0200
-- 
cgit v1.2.1