From: derek <derekwbarnett@gmail.com>
Date: Sat, 10 Sep 2011 02:05:02 +0000 (-0400)
Subject: Merge branches 'master' and 'iodevice' into iodevice
X-Git-Url: https://git.donarmstrong.com/?p=bamtools.git;a=commitdiff_plain;h=c1fc1c5423ca73a1b5bcbe790650821d73e5959c

Merge branches 'master' and 'iodevice' into iodevice
---

c1fc1c5423ca73a1b5bcbe790650821d73e5959c
diff --cc src/api/internal/BgzfStream_p.cpp
index 4db9b15,36599b5..3b70749
--- a/src/api/internal/BgzfStream_p.cpp
+++ b/src/api/internal/BgzfStream_p.cpp
@@@ -1,9 -1,8 +1,8 @@@
  // ***************************************************************************
  // BgzfStream_p.cpp (c) 2011 Derek Barnett
  // Marth Lab, Department of Biology, Boston College
- // All rights reserved.
  // ---------------------------------------------------------------------------
 -// Last modified: 2 September 2011(DB)
 +// Last modified: 9 September 2011(DB)
  // ---------------------------------------------------------------------------
  // Based on BGZF routines developed at the Broad Institute.
  // Provides the basic functionality for reading & writing BGZF files
diff --cc src/utils/bamtools_utilities.h
index 71d4683,52098d0..d9a3192
--- a/src/utils/bamtools_utilities.h
+++ b/src/utils/bamtools_utilities.h
@@@ -1,9 -1,8 +1,8 @@@
  // ***************************************************************************
  // bamtools_utilities.h (c) 2010 Derek Barnett, Erik Garrison
  // Marth Lab, Department of Biology, Boston College
- // All rights reserved.
  // ---------------------------------------------------------------------------
 -// Last modified: 9 June 2011
 +// Last modified: 8 September 2011
  // ---------------------------------------------------------------------------
  // Provides general utilities used by BamTools sub-tools.
  // ***************************************************************************