[med-svn] [macs] 02/03: Merge tag 'upstream/2.1.1.20160309'

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository macs.

commit 13ec4527d9fe01388042bd6b684141b1f707ee2a
Merge: 20503bf 88a91b9
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Fri May 13 09:45:23 2016 -0700

    Merge tag 'upstream/2.1.1.20160309'
    
    Upstream version 2.1.1.20160309

 ChangeLog                  |   15 +
 MACS2.egg-info/PKG-INFO    |    2 +-
 MACS2/Constants.py         |    2 +-
 MACS2/IO/FixWidthTrack.c   | 3157 +++++++++++++++++-------
 MACS2/IO/FixWidthTrack.pyx |    2 +-
 MACS2/IO/Parser.c          | 5823 ++++++++++++++++++++++++++++----------------
 MACS2/IO/Parser.pyx        |   13 +-
 MACS2/PeakModel.c          | 2703 ++++++++++++++------
 MACS2/PeakModel.pyx        |    2 +-
 PKG-INFO                   |    2 +-
 bin/macs2                  |   26 +-
 setup.py                   |    4 +-
 setup_w_cython.py          |    4 +-
 13 files changed, 7941 insertions(+), 3814 deletions(-)

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