summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-06-06 14:33:38 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-06-06 14:33:38 +0000
commit69ea123cdc5cb88e9087dacd7e4c4e82f553d095 (patch)
tree082ecff1d0c5162612adbe0b272d0b38c90c3b87
parent6c5fb7ef713c2e8071c019f8580ad198f279e18c (diff)
downloadeet-1.4.tar.gz
1.0.2 releasev1.4.2eet-1.4
SVN revision: 71757
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f2ed3a0..61a9169 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -502,3 +502,7 @@
2012-05-30 Cedric Bail
* Check that gnutls and openssl don't return below zero size during decipher.
+
+2012-06-06 Mike Blumenkrantz
+
+ * 1.4.2 release
diff --git a/configure.ac b/configure.ac
index d638952..5836539 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ y##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_maj], [1])
m4_define([v_min], [4])
-m4_define([v_mic], [1])
+m4_define([v_mic], [2])
m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
##-- When released, remove the dnl on the below line