[med-svn] [htslib] 01/10: Merge version number bump and NEWS file from master

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository htslib.

commit 9156a412e23139d25bdb3153d94638bcaa9a6dc2
Merge: fba943d 49fdfbd
Author: Valeriu Ohan <vo2 at sanger.ac.uk>
Date:   Tue Jun 20 15:02:12 2017 +0100

    Merge version number bump and NEWS file from master

 Makefile  | 2 +-
 NEWS      | 3 +++
 htsfile.1 | 2 +-
 tabix.1   | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --cc NEWS
index 47546d0,47546d0..c160170
--- a/NEWS
+++ b/NEWS
@@@ -1,3 -1,3 +1,6 @@@
++Noteworthy changes in release a.b (Equinox)
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++
  Noteworthy changes in release 1.5 (21st June 2017)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/htslib.git