summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Mulansky <mario.mulansky@gmx.net>2015-04-21 18:21:11 +0200
committerMario Mulansky <mario.mulansky@gmx.net>2015-04-21 18:21:11 +0200
commit1b9f4ec0aee1281464cfcab02bb4c7c302dbbb00 (patch)
tree4b0f3cbb817d6ed3a287d6d22b9d257873476cad
parent22f480fc5c53308779667beb24604d8fc019fd9e (diff)
updated contributors
-rw-r--r--Contributors.txt6
-rw-r--r--Readme.rst4
2 files changed, 8 insertions, 2 deletions
diff --git a/Contributors.txt b/Contributors.txt
index 51e6751..0d4afee 100644
--- a/Contributors.txt
+++ b/Contributors.txt
@@ -4,7 +4,11 @@ Python/C Programming:
Scientific Methods:
- Thomas Kreuz
- Nebojsa D. Bozanic
+- Mario Mulansky
+- Conor Houghton
+- Daniel Chicharro
+
The work on PySpike was supported by the European Comission through the Marie
Curie Initial Training Network 'Neural Engineering Transformative Technologies
-(NETT)' under the project number 289146. \ No newline at end of file
+(NETT)' under the project number 289146.
diff --git a/Readme.rst b/Readme.rst
index e736262..03441fc 100644
--- a/Readme.rst
+++ b/Readme.rst
@@ -297,7 +297,9 @@ Curie Initial Training Network* `Neural Engineering Transformative Technologies
**Scientific Methods:**
- Thomas Kreuz
- Nebojsa D. Bozanic
-
+ - Mario Mulansky
+ - Conor Houghton
+ - Daniel Chicharro
.. _ISI: http://www.scholarpedia.org/article/Measures_of_spike_train_synchrony#ISI-distance
.. _SPIKE: http://www.scholarpedia.org/article/SPIKE-distance