[hdf-compass] 27/295: Merge branch 'file_filter'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository hdf-compass.

commit 9b51693f8f21f03be0948b24c53fc3a0320bee5b
Merge: fee3546 e6efa9e
Author: John Readey <jreadey at hdfgroup.org>
Date:   Tue Jul 22 22:20:26 2014 -0700

    Merge branch 'file_filter'
    
    merge with local changes

 compass_model/__init__.py |   5 +++++
 compass_viewer/frame.py   |  20 +++++++++++++++++++-
 docs/.DS_Store            | Bin 12292 -> 6148 bytes
 docs/index.rst            |   6 ++++++
 hdf5_model/__init__.py    |   2 ++
 5 files changed, 32 insertions(+), 1 deletion(-)

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