Merge branch 'master'

Conflicts: pylot/core/analysis/magnitude.py pylot/core/pick/autopick.py pylot/core/util/dataprocessing.py
2016-09-29 14:01:15 +02:00
parent 04da34deec 8a5fcf05bf
commit ad909804d1
2 changed files with 2 additions and 0 deletions
--- a/pylot/core/util/dataprocessing.py
+++ b/pylot/core/util/dataprocessing.py
@@ -4,6 +4,7 @@
 import os
 import glob
 import sys
+from obspy.io.xseed import Parser

 import numpy as np