[Xfce4-commits] <xfce4-clipman-plugin:master> === Release 1.2.4 ===

[Mike Massonnet]

Updating branch refs/heads/master
         to 130aa64bcd3e175f9ba8dbc031a75d7f60626b2d (commit)
       from 47263528ba69f5b9758ab87d58be1998132144b9 (commit)

commit 130aa64bcd3e175f9ba8dbc031a75d7f60626b2d
Author: Mike Massonnet <m8t at gandi.net>
Date:   Sun Feb 2 22:01:08 2014 +0100

    === Release 1.2.4 ===

 ChangeLog       |   20 ++++++++++++++++++++
 NEWS            |    8 ++++++++
 README          |    1 +
 configure.ac.in |    2 +-
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 135f3a4..be10957 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2014-02-02	Mike Massonnet
+=== Release 1.2.4 ===
+
+2014-02-02  Mike Massonnet
+Remove doc submodule
+
+2014-02-02  Mike Massonnet
+Bug #10667: define different menmonic
+
+2014-02-02  Christian Hesse
+Bug #9528: QR-code encoder
+
+    Optional build, requires libqrencode >= 3.3.
+
+2014-02-01  Mike Massonnet
+Bug #9896: move Disable item inside context/right-click menu
+
+2014-02-01  Mike Massonnet
+Bug #10506: allow skipping actions by pressing or not CTRL
+
 2012-04-09	Mike Massonnet
 === Release 1.2.3 ===
 
diff --git a/NEWS b/NEWS
index f0d377e..d20b5cb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Version 1.2.4 - 2014-02-02
+
+- Removed doc submodule
+- Bug 10667: Define different menmonic
+- Bug 9528: QR-code encoder
+- Bug 9896: Move Disable item inside context/right-click menu
+- Bug 10506: Allow skipping actions by pressing or not CTRL
+
 Version 1.2.3 - 2012-04-09
 
 - Use new online documentation location http://docs.xfce.org/
diff --git a/README b/README
index 9673151..d491b95 100644
--- a/README
+++ b/README
@@ -29,6 +29,7 @@ http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin/
  Optional
 
 * unique-1.0 1.0
+* libqrencode3 3.3
 
  Install
 ---------
diff --git a/configure.ac.in b/configure.ac.in
index 932a839..777aa5b 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -13,7 +13,7 @@ m4_define([project_version_major], [1])
 m4_define([project_version_minor], [2])
 m4_define([project_version_micro], [4])
 m4_define([project_version_build], [@REVISION@])
-m4_define([project_version_tag], [git]) # leave empty for release
+m4_define([project_version_tag], []) # leave empty for release
 m4_define([project_version], [project_version_major().project_version_minor().project_version_micro()ifelse(project_version_tag(), [git], [project_version_tag()-project_version_build()], [project_version_tag()])])
 
 dnl ***************************