[hdf-compass] 102/295: merged pull req

[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 e005b2d047e1551bab935636b9828c98a97bfcc6
Merge: 5f7881c 3f2e845
Author: jreadey <jreadey at hdfgroup.org>
Date:   Thu Oct 1 22:03:17 2015 -0700

    merged pull req

 asc_model/__init__.py      |  7 +++++--
 compass_viewer/__init__.py |  5 ++++-
 compass_viewer/frame.py    |  7 ++++++-
 hdf5_model/__init__.py     | 12 +++++++++---
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --cc compass_viewer/frame.py
index b78cb7d,4dffa5e..37b62aa
--- a/compass_viewer/frame.py
+++ b/compass_viewer/frame.py
@@@ -18,7 -18,7 +18,9 @@@ Much of the common functionality (e.g. 
  here.
  """
  
++
 +import os
+ import sys
  import wx
  from wx.lib.pubsub import pub
  

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