Merge remote-tracking branch 'upstream/maintenance_1.0.x'
Conflicts: obspy/clients/fdsn/mass_downloader/download_helpers.py obspy/io/stationtxt/core.py
Showing
- obspy/clients/fdsn/client.py 18 additions, 19 deletionsobspy/clients/fdsn/client.py
- obspy/clients/fdsn/mass_downloader/download_helpers.py 8 additions, 5 deletionsobspy/clients/fdsn/mass_downloader/download_helpers.py
- obspy/clients/fdsn/mass_downloader/mass_downloader.py 1 addition, 5 deletionsobspy/clients/fdsn/mass_downloader/mass_downloader.py
- obspy/clients/fdsn/mass_downloader/utils.py 7 additions, 4 deletionsobspy/clients/fdsn/mass_downloader/utils.py
- obspy/clients/iris/client.py 19 additions, 16 deletionsobspy/clients/iris/client.py
- obspy/clients/seedlink/easyseedlink.py 7 additions, 4 deletionsobspy/clients/seedlink/easyseedlink.py
- obspy/clients/seishub/client.py 19 additions, 17 deletionsobspy/clients/seishub/client.py
- obspy/clients/seishub/tests/test_client.py 6 additions, 4 deletionsobspy/clients/seishub/tests/test_client.py
- obspy/core/tests/test_event.py 1 addition, 1 deletionobspy/core/tests/test_event.py
- obspy/core/util/base.py 1 addition, 4 deletionsobspy/core/util/base.py
- obspy/core/util/obspy_types.py 1 addition, 3 deletionsobspy/core/util/obspy_types.py
- obspy/db/scripts/indexer.py 6 additions, 5 deletionsobspy/db/scripts/indexer.py
- obspy/imaging/tests/test_mopad_script.py 4 additions, 2 deletionsobspy/imaging/tests/test_mopad_script.py
- obspy/io/mseed/scripts/recordanalyzer.py 1 addition, 4 deletionsobspy/io/mseed/scripts/recordanalyzer.py
- obspy/io/ndk/core.py 5 additions, 4 deletionsobspy/io/ndk/core.py
- obspy/io/stationtxt/core.py 1 addition, 1 deletionobspy/io/stationtxt/core.py
Loading
Please register or sign in to comment