From be3a78189b68be5c44f7e2202dd69c67a98997dd Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden1@rty.ca>
Date: Tue, 22 Jul 2008 01:15:57 +0000
Subject: [PATCH]     * Conky 1.6.0 released

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1228 7f574dfc-610e-0410-a909-a81674777703
---
 ChangeLog       | 3 +++
 configure.ac.in | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b932eb75..3199d5c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 # $Id$
 
+2008-07-21
+	* Conky 1.6.0 released
+
 2008-07-16
 	* Fixed bug with $if_empty and $mpd_* vars (sf.net #2008752)
 
diff --git a/configure.ac.in b/configure.ac.in
index ceed7cdd..616d6096 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -4,7 +4,7 @@ dnl major, minor and micro version macros.
 m4_define([conky_version_major], [1])
 m4_define([conky_version_minor], [6])
 m4_define([conky_version_micro], [0])
-m4_define([conky_version_tag], [pre]) dnl [] for releases
+m4_define([conky_version_tag], []) dnl [] for releases
 m4_define([conky_version_revision],[_pre@REVISION@])
 m4_define([conky_version],
     [conky_version_major().conky_version_minor().conky_version_micro()ifelse(