diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2014-09-15 17:31:55 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2014-09-15 17:31:55 +0200 |
| commit | 5ea0fc218bb3bb30b1c40dd20e2e35a8bd11151c (patch) | |
| tree | e4e01ee2d7f8698b4dcc2b9d6041d37963474e41 /pyspike/__init__.py | |
| parent | f9529c78538882879a07cb67e342eade8d2153ab (diff) | |
+merge_spike_trains
Diffstat (limited to 'pyspike/__init__.py')
| -rw-r--r-- | pyspike/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyspike/__init__.py b/pyspike/__init__.py index 6651eb5..6895bd8 100644 --- a/pyspike/__init__.py +++ b/pyspike/__init__.py @@ -2,4 +2,4 @@ __all__ = ["function", "distances", "spikes"] from function import PieceWiseConstFunc from distances import isi_distance -from spikes import spike_train_from_string +from spikes import spike_train_from_string, merge_spike_trains |