Commit Graph

2 Commits

Author SHA1 Message Date
Ludger Küperkoch
b42b87602b Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
Conflicts:
	pylot/core/pick/earllatepicker.py
	pylot/core/pick/fmpicker.py
	pylot/core/pick/getSNR.py
2015-04-13 09:36:22 +02:00
474622027e now the station selection works fine and a picking window is opened when the waveform has been clicked 2015-03-12 13:59:29 +01:00