From 71b1a3242c2ef6e5419f566324a22c6bfa5119fd Mon Sep 17 00:00:00 2001 From: Thomas White Date: Fri, 15 May 2015 17:18:12 +0200 Subject: s/lsq_intensities/merge_intensities/ --- src/merge.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/merge.c') diff --git a/src/merge.c b/src/merge.c index f7a654ea..449f8a87 100644 --- a/src/merge.c +++ b/src/merge.c @@ -187,8 +187,9 @@ static void finalise_merge_job(void *vqargs, void *vwargs) } -RefList *lsq_intensities(Crystal **crystals, int n, int n_threads, - PartialityModel pmodel, int min_meas, double push_res) +RefList *merge_intensities(Crystal **crystals, int n, int n_threads, + PartialityModel pmodel, int min_meas, + double push_res) { RefList *full; RefList *full2; -- cgit v1.2.3