Skip to content

Commit d036012

Browse files
author
Andrew Davison
committed
Added FACETS and BrainScaleS to funding acknowledgements
[skip ci]
1 parent 745700b commit d036012

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

doc/contributors.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ If you are interested in using PyNN, but the choice of licence is a problem for
2626
Funding
2727
=======
2828

29-
Development of PyNN has been partially funded by the European Union Seventh Framework Program (FP7/2007­2013)
30-
under grant agreement no. 604102 (HBP), and by the European Union’s Horizon 2020 Framework Programme for
29+
Development of PyNN has been partially funded by the European Union Sixth Framework Program (FP6) under
30+
grant agreement FETPI-015879 (FACETS), by the European Union Seventh Framework Program (FP7/2007­-2013)
31+
under grant agreements no. 269921 (BrainScaleS) and no. 604102 (HBP),
32+
and by the European Union’s Horizon 2020 Framework Programme for
3133
Research and Innovation under the Specific Grant Agreements No. 720270 (Human Brain Project SGA1)
32-
and No. 785907 (Human Brain Project SGA2).
34+
and No. 785907 (Human Brain Project SGA2).

0 commit comments

Comments
 (0)