Merge remote-tracking branch 'upstream/maintenance_1.0.x' (3001acb6) · Commits · Lloyd Carothers / obspyPIC · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

obspyPIC
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

3001acb6

Unverified Commit 3001acb6 authored 8 years ago by Tobias Megies

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/maintenance_1.0.x'

Conflicts:
	obspy/CONTRIBUTORS.txt

parents 8e2e51c0 03ca7b21

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.txt 1 addition, 0 deletions

CHANGELOG.txt
obspy/CONTRIBUTORS.txt 1 addition, 0 deletions

obspy/CONTRIBUTORS.txt
obspy/clients/earthworm/waveserver.py 13 additions, 3 deletions

obspy/clients/earthworm/waveserver.py
obspy/io/xseed/blockette/blockette051.py 1 addition, 1 deletion

obspy/io/xseed/blockette/blockette051.py
obspy/io/xseed/tests/blockette-tests/blockette051.txt 13 additions, 1 deletion

obspy/io/xseed/tests/blockette-tests/blockette051.txt
obspy/io/xseed/tests/test_parser.py 9 additions, 20 deletions

obspy/io/xseed/tests/test_parser.py

with 38 additions and 25 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment