Merge branch 'master' into develop

Conflicts: scripts/pylot-reasses-pilot-event.py
2016-05-03 08:58:33 +02:00
parent 210d39882d ae0c08eeb2
commit ecb3670aeb
2 changed files with 6 additions and 0 deletions
--- a/scripts/pylot-reasses-pilot-event.py
+++ b/scripts/pylot-reasses-pilot-event.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-

 import argparse
+
+from pylot.core.pick.utils import reassess_pilot_event
 from pylot.core.util.version import get_git_version as _getVersionString
 from pylot.core.io.phases import reassess_pilot_event