Merge branch 'release/2.1.4' into develop

fd3889a8 · Matteo Quintiliani · 196e365d · 412222ca · fd3889a8 · fd3889a8
Commit fd3889a8 authored Jan 04, 2017 by Matteo Quintiliani
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

HISTORY HISTORY +1 -1

configure.ac configure.ac +1 -1

No files found.
--- a/HISTORY
+++ b/HISTORY
@@ -2,7 +2,7 @@
 nmxptool Release History
 #########################

-* Release 2.1.4-dev    (2017/01/04)
+* Release 2.1.4    (2017/01/04)
    - Exit if connect() fails first time.
    - Fix checking port number for option -P and -D.
    - Fix checking short-term-completion, option -S.

--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ m4_define([major_version], [2])
 m4_define([minor_version], [1])
 m4_define([micro_version], [4])
 # Comment build_version for stable release
-m4_define([build_version], [dev])
+# m4_define([build_version], [dev])

 m4_ifdef([build_version], [
 	  m4_define([version],