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

Merge branch 'release/2.1.2'

parents 533f6032 04b2662a

HISTORY

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
nmxptool Release History

nmxptool Release History

#########################

#########################





* Release 2.1.2-rc2    (2014/02/05) 

* Release 2.1.2    (2015/06/26) 

    - Fixed major bug in small time drifting of packets stored in mini-SEED format.

    - Fixed major bug in small time drifting of packets stored in mini-SEED format.

    - Started to fix 'Ubuntu vs. gettimeofday()' issue

    - Started to fix 'Ubuntu vs. gettimeofday()' issue

INSTALL

+2 −2
Original line number Original line Diff line number Diff line
@@ -12,8 +12,8 @@ without warranty of any kind. 
Basic Installation

Basic Installation

==================

==================





   Briefly, the shell commands `./configure; make; make install' should

   Briefly, the shell command `./configure && make && make install'

configure, build, and install this package.  The following

should configure, build, and install this package.  The following

more-detailed instructions are generic; see the `README' file for

more-detailed instructions are generic; see the `README' file for

instructions specific to this package.  Some packages provide this

instructions specific to this package.  Some packages provide this

`INSTALL' file but do not implement all of the features documented

`INSTALL' file but do not implement all of the features documented

bootstrap

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ ${AUTOHEADER} || exit 
${ACLOCAL} || exit

${ACLOCAL} || exit





# ${AUTOMAKE} --gnu --add-missing --force-missing  || exit

# ${AUTOMAKE} --gnu --add-missing --force-missing  || exit

${AUTOMAKE} --add-missing --force-missing  || exit

${AUTOMAKE} --copy --add-missing --force-missing  || exit

# ${AUTOMAKE} -a -c || exit

# ${AUTOMAKE} -a -c || exit

# ${AUTOMAKE} -a || exit

# ${AUTOMAKE} -a || exit

configure.ac

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ m4_define([major_version], [2]) 
m4_define([minor_version], [1])

m4_define([minor_version], [1])

m4_define([micro_version], [2])

m4_define([micro_version], [2])

# Comment build_version for stable release

# Comment build_version for stable release

m4_define([build_version], [rc2])

# m4_define([build_version], [rc2])





m4_ifdef([build_version], [

m4_ifdef([build_version], [

	  m4_define([version],

	  m4_define([version],