Commit 75473ef9 authored by Momme Butenschoen's avatar Momme Butenschoen

Merge branch 'master' of gitlab.ecosystem-modelling.pml.ac.uk:momm/pyprotex

Conflicts:
	PyProTex.py
	py3/PyProTex.py
parents 7424cf1f 9b7d6772
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
# WITHOUT ANY WARRANTY; without even the implied warranty of # WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser
# NU General Public License for more details. # NU General Public License for more details.
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser
# NU General Public License for more details.
# You should have received a copy of the Lesser GNU General Public License # You should have received a copy of the Lesser GNU General Public License
# along with SSB-ERSEM. If not, see <http://www.gnu.org/licenses/>. # along with SSB-ERSEM. If not, see <http://www.gnu.org/licenses/>.
# #
......
...@@ -8,11 +8,12 @@ For help: PyProTex.py ...@@ -8,11 +8,12 @@ For help: PyProTex.py
By default, output is directed to stdout. By default, output is directed to stdout.
This as a python version of the former protex perl tool. This is a python version of the former protex perl tool.
The perl tool was developed at the Goddard Space Flight Center The perl tool was developed at the Goddard Space Flight Center
by Arlindo Da Silva, Will Sawyer, and others under no specific by Arlindo Da Silva, Will Sawyer, and others under no specific
license. license.
The python version was created by Momme Butenschoen at the The python version was created by Momme Butenschoen at the
Plymouth Marine Laboratory Plymouth Marine Laboratory and is published under the terms of the
Lesser GNU General Public License.
The adaptation is based on the version 2.0 as downloaded from The adaptation is based on the version 2.0 as downloaded from
http://acmg.seas.harvard.edu/geos/wiki_docs/protex/protex.tar.gz http://acmg.seas.harvard.edu/geos/wiki_docs/protex/protex.tar.gz
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment