pylot/pylot/RELEASE-VERSION
Ludger Küperkoch ab840fbcf1 Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop
Try to solve conflict, only marginal changes.
Conflicts:
	pylot/core/pick/utils.py
2015-06-25 11:17:32 +02:00

2 lines
11 B
Plaintext