aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2013-02-18 14:51:36 +0100
committerThomas White <taw@physics.org>2013-02-18 14:51:36 +0100
commit31ec28ea0258bbb2272afa4346b55b183a43410c (patch)
treee5c3df47166401b9a80384a2f5f137d674f5bef9 /ChangeLog
parenta0f4c1506f1d7c1ad942bcccd30d3aaf0cd75bd4 (diff)
parent3732cd6e08e4b0e6b6eaafc01290bc2c23e9ec66 (diff)
Merge branch 'cornelius/xds' into tom/multicrystal
Conflicts: libcrystfel/Makefile.am libcrystfel/src/index.c libcrystfel/src/index.h
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions