[cherry-pick] merged conflicts after cherry-pick of commit [17585f9381]

2016-09-19 11:42:52 +02:00
parent 1e4b1d691a
commit 420f382051
6 changed files with 12 additions and 12 deletions
--- a/pylot/core/util/utils.py
+++ b/pylot/core/util/utils.py
@@ -206,7 +206,7 @@ def four_digits(year):
    return year


-def getGlobalTimes(stream):
+def full_range(stream):
    '''
    takes a stream object and returns the latest end and the earliest start
    time of all contained trace objects