[hdf-compass] 266/295: Merge remote-tracking branch 'upstream/develop' into ticket_118

[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 0608c57d9c38d5eb528caaf2e56dd2e9035aaa5c
Merge: 4c50c48 51f383f
Author: giumas <giumas at yahoo.it>
Date:   Sun Jan 31 12:17:43 2016 -0500

    Merge remote-tracking branch 'upstream/develop' into ticket_118

 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc README.rst
index c8b6900,62a6504..0fafb40
--- a/README.rst
+++ b/README.rst
@@@ -41,8 -41,7 +41,8 @@@ You will need
  * `Python 2.7 <https://www.python.org/downloads/>`_ *(support for Python 3.4+ in progress)*
  * `NumPy <https://github.com/numpy/numpy>`_
  * `Matplotlib <https://github.com/matplotlib/matplotlib>`_
- * `wxPython Phoenix 3.0.0 <https://github.com/wxWidgets/Phoenix>`_ *(later releases have not been tested)*
+ * `wxPython Phoenix 3.0.2 <https://github.com/wxWidgets/Phoenix>`_ *(later releases have not been tested)*
 +* `Cartopy <https://github.com/SciTools/cartopy>`_
  * `h5py <https://github.com/h5py/h5py>`_ *[HDF plugin]*
  * `hydroffice.bag <https://bitbucket.org/ccomjhc/hyo_bag>`_ *[BAG plugin]*
  * `Pydap <https://github.com/robertodealmeida/pydap>`_ *[OPeNDAP plugin]*

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