@@ -161,9 +161,11 @@ signals = prefix "Signal"
161161 , "keepWhen" -:: signalOf bool ==> a ==> signalOf a ==> signalOf a
162162 , "dropWhen" -:: signalOf bool ==> a ==> signalOf a ==> signalOf a
163163 , "dropRepeats" -:: signalOf a ==> signalOf a
164− , "sampleOn" -:: signalOf a ==> signalOf b ==> signalOf b
165− , "merge" -:: signalOf a ==> signalOf a ==> signalOf a
166− , "merges" -:: listOf (signalOf a) ==> signalOf a
164+ , "sampleOn" -:: signalOf a ==> signalOf b ==> signalOf b
165+ , "timestamp" -:: signalOf a ==> signalOf (tupleOf [time,a])
166+ , "timeOf" -:: signalOf a ==> signalOf time
167+ , "merge" -:: signalOf a ==> signalOf a ==> signalOf a
168+ , "merges" -:: listOf (signalOf a) ==> signalOf a
167169 , numScheme (\n -> int ==> signalOf n ==> signalOf float) "average"
168170 ]
169171
@@ -211,7 +213,7 @@ times = prefix "Time"
211213 , "hour" -: time
212214 , "minute" -: time
213215 , "second" -: time
214− , "ms" -: time
216+ , "ms" -: time
215217 , "inHours" -: time ==> float
216218 , "inMinutes" -: time ==> float
217219 , "inSeconds" -: time ==> float