[segyio] 323/376: Merge pull request #138 from jokva/packaging-and-changelog

[Jørgen Kvalsvik]

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

jokva-guest pushed a commit to branch debian
in repository segyio.

commit 9e4126de51952fee3459f28d6616e1c06607bb9c
Merge: e5e62d7 6df3742
Author: jokva <jokva at statoil.com>
Date:   Fri Jun 30 23:39:05 2017 +0200

    Merge pull request #138 from jokva/packaging-and-changelog
    
    Packaging and changelog

 applications/CMakeLists.txt                |  8 ++++----
 applications/{segycath.c => segyio-cath.c} |  4 ++--
 changelog.md                               | 15 +++++++++++++++
 python/setup.py.in                         |  2 +-
 requires.txt                               |  1 +
 5 files changed, 23 insertions(+), 7 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/segyio.git