marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop

Browse Source 
Try to solve conflict, only marginal changes.
Conflicts:
	pylot/core/pick/utils.py
This commit is contained in:
Ludger Küperkoch
2015-06-25 11:17:32 +02:00
parent edd925af99 e542aa70d9
commit ab840fbcf1
5 changed files with 86 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pylot/RELEASE-VERSION
View File

@@ -1 +1 @@
694a-dirty
1abc-dirty