[med-svn] samtools 02/11: Merge version number bump from master branch

[Charles Plessy]

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

plessy pushed a commit to branch develop
in repository samtools.

commit 2192dda9e2b7bfaf0c31feed65a052ea1e61fc35
Merge: ad732cd 5370fe9
Author: John Marshall <jm18 at sanger.ac.uk>
Date:   Fri Aug 15 11:36:35 2014 +0100

    Merge version number bump from master branch

 Makefile   |  2 +-
 NEWS       | 14 ++++++++++++++
 bam.h      |  6 +-----
 samtools.1 |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --cc bam.h
index f53fcea,5962241..c43e12c
--- a/bam.h
+++ b/bam.h
@@@ -38,11 -38,7 +38,7 @@@ DEALINGS IN THE SOFTWARE.  *
    @copyright Genome Research Ltd.
   */
  
- #ifndef VERSION
- #define BAM_VERSION "0.2.0+"
- #else
- #define BAM_VERSION VERSION
- #endif
 -#define BAM_VERSION "1.0"
++#define BAM_VERSION "1.0+"
  
  #include <stdint.h>
  #include <stdlib.h>

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