summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f43ae5f5..0ddc5e97f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -498,3 +498,7 @@
4982012-10-19 ChunEon Park (Hermet) 4982012-10-19 ChunEon Park (Hermet)
499 499
500 * Fix elm_transit image animation which last few frames are skipped. 500 * Fix elm_transit image animation which last few frames are skipped.
501
5022012-10-20 Cedric Bail
503
504 1.7.1 release
diff --git a/configure.ac b/configure.ac
index 2aa7a5ed3..31b3e5705 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [1]) 3m4_define([v_maj], [1])
4m4_define([v_min], [7]) 4m4_define([v_min], [7])
5m4_define([v_mic], [0]) 5m4_define([v_mic], [1])
6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
7m4_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']))]) 7m4_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']))])
8##-- When released, remove the dnl on the below line 8##-- When released, remove the dnl on the below line