diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2012-07-02 09:44:01 +0200 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2012-07-02 09:44:01 +0200 |
| commit | 81d0cc926576519536d89af8f74272b00acd4fd5 (patch) | |
| tree | 41829ab0e2b7461446d1bad657cef44fad2ebde5 /README | |
| parent | a4ffb65ff4da923aabdb107cdaf59fccba30b409 (diff) | |
| parent | d7cacb7871a7d49057453b768e420dfb0ab52077 (diff) | |
Merge branch 'master' into tom/speed
Conflicts:
libcrystfel/src/peaks.c
src/indexamajig.c
Diffstat (limited to 'README')
| -rw-r--r-- | README | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -7,6 +7,7 @@ Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, Authors: Thomas White <taw@physics.org> Richard Kirian <rkirian@asu.edu> + Kenneth Beyerlein <kenneth.beyerlein@desy.de> Andrew Aquila <andrew.aquila@cfel.de> Andrew Martin <andrew.martin@desy.de> Lorenzo Galli <lorenzo.galli@desy.de> |