summaryrefslogtreecommitdiff
path: root/Contributors.txt
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 /Contributors.txt
parent22f480fc5c53308779667beb24604d8fc019fd9e (diff)
updated contributors
Diffstat (limited to 'Contributors.txt')
-rw-r--r--Contributors.txt6
1 files changed, 5 insertions, 1 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.