diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-05-18 15:29:41 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-05-18 15:29:41 +0200 |
| commit | d985f3a8de6ae840c8a127653b3d9affb1a8aa40 (patch) | |
| tree | fc583b16d030b6ba67cf09895fd269bd297ad660 /Contributors.txt | |
| parent | a718911ba2aac9302465c0522cc18b4470b99f77 (diff) | |
| parent | 2b957ac5d7c964b6fe0e99bb078a396732331869 (diff) | |
Merge branch 'develop'0.3.0
Diffstat (limited to 'Contributors.txt')
| -rw-r--r-- | Contributors.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Contributors.txt b/Contributors.txt index 0d4afee..83563c7 100644 --- a/Contributors.txt +++ b/Contributors.txt @@ -3,10 +3,10 @@ Python/C Programming: Scientific Methods: - Thomas Kreuz -- Nebojsa D. Bozanic -- Mario Mulansky -- Conor Houghton - Daniel Chicharro +- Conor Houghton +- Nebojsa Bozanic +- Mario Mulansky The work on PySpike was supported by the European Comission through the Marie |