diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
| commit | ad29154d8c152996d16c012dcc5798c5f1957aed (patch) | |
| tree | f01575082a649061362178d4a9870cb5fe2c33f6 /Contributors.txt | |
| parent | 1fa8493ce15af8cd4c057eece155f1557fc241ea (diff) | |
| parent | c17cc8602414cec883c412008a4300b2c7ac7f80 (diff) | |
Merge branch 'master' into new_directionality
Conflicts:
pyspike/__init__.py
pyspike/cython/cython_directionality.pyx
pyspike/cython/directionality_python_backend.py
pyspike/spike_directionality.py
setup.py
Diffstat (limited to 'Contributors.txt')
| -rw-r--r-- | Contributors.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Contributors.txt b/Contributors.txt index 83563c7..512aa7f 100644 --- a/Contributors.txt +++ b/Contributors.txt @@ -1,5 +1,6 @@ Python/C Programming: - Mario Mulansky +- Igor Gnatenko Scientific Methods: - Thomas Kreuz |