Commit fd3889a8 authored by Matteo Quintiliani's avatar Matteo Quintiliani
Browse files

Merge branch 'release/2.1.4' into develop

parents 196e365d 412222ca
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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.
+1 −1
Original line number Diff line number Diff line
@@ -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],