[segyio] 129/376: Merge pull request #60 from jepebe/colormap_combo

[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 554c46c5c0aa503231b1ee21758946bc8b480886
Merge: 0a5c9db 40ba14c
Author: Jean-Paul <jepebe at users.noreply.github.com>
Date:   Sat Nov 19 10:25:33 2016 +0100

    Merge pull request #60 from jepebe/colormap_combo
    
    Colormap Combo Widget

 examples/showcase_gui.py         | 15 ++++++-
 python/segyview/CMakeLists.txt   |  1 +
 python/segyview/__init__.py      |  1 +
 python/segyview/colormapcombo.py | 84 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 99 insertions(+), 2 deletions(-)

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