diff options
| author | Thomas White <taw@physics.org> | 2017-07-06 17:22:11 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2017-07-06 17:24:59 +0200 |
| commit | 5292f57d4434c7267e8d945871513d742ff42427 (patch) | |
| tree | d460aa5cef5a501516876850ef243cfc27313d5a /doc/man/crystfel.7 | |
| parent | 48d4a6b8e82cce81222ec58fdfb488ed79ce0bcf (diff) | |
| parent | dc3395900fc3ce0d3961757628ff83ad6456be19 (diff) | |
Merge branch 'master' into taketwo
Diffstat (limited to 'doc/man/crystfel.7')
| -rw-r--r-- | doc/man/crystfel.7 | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/doc/man/crystfel.7 b/doc/man/crystfel.7 index bc545069..b7063b21 100644 --- a/doc/man/crystfel.7 +++ b/doc/man/crystfel.7 @@ -1,7 +1,7 @@ .\" .\" CrystFEL main man page .\" -.\" Copyright © 2012-2015 Deutsches Elektronen-Synchrotron DESY, +.\" Copyright © 2012-2017 Deutsches Elektronen-Synchrotron DESY, .\" a research centre of the Helmholtz Association. .\" .\" Part of CrystFEL - crystallography with a FEL @@ -125,6 +125,15 @@ to this list if you experience difficulty with "-y" at any time. .IP Cubic \fB23\fR, \fBm-3\fR, \fB432\fR, \fB-43m\fR, \fBm-3m\fR. +.SH FUNDING ACKNOWLEDGEMENTS +Development of CrystFEL is primarily funded by the Helmholtz Association via programme-oriented funds. + +Additional funding for CrystFEL is provided by "X-Probe", a project of the European Union's 2020 Research and Innovation Program Under the Marie Skłodowska-Curie grant agreement 637295 (2015-2018). + +Additional funding for CrystFEL is provided by the BMBF German-Russian Cooperation "SyncFELMed", grant 05K14CHA (2014-2017). + +Past funding for CrystFEL has been received from BioStruct-X, a project funded by the Seventh Framework Programme (FP7) of the European Commission. + .SH AUTHOR This page was written by Thomas White and Valerio Mariani. |