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

Merge branch 'develop' of 134.147.164.251:/data/git/pylot into develop

Browse Source 
Conflicts:
	pylot/core/util/utils.py
This commit is contained in:
Sebastian Wehling-Benatelli 2015-02-10 13:17:46 +01:00
commit d5c9ad41be
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pylot/core/util/utils.py
View File

@ -115,6 +115,7 @@ def createEvent(origintime, cinfo, etype, resID=None, authority_id=None):
event.creation_info = cinfo
event.event_type = etype
return event
def createPick(picknum, picktime, eventnum, cinfo, phase, station, wfseedstr,
def createPick(origintime, picknum, picktime, eventnum, cinfo, phase, station,