[Horace-svn] r1278 - in trunk: _LowLevelCode/build_all _LowLevelCode/cpp/accumulate_cut_c _LowLevelCode/cpp/accumulate_cut_c/accumulate_cut_c _LowLevelCode/cpp/bin_pixels_c _LowLevelCode/cpp/bin_pixels_c/bin_pixels_c _LowLevelCode/cpp/calc_projections_c _LowLevelCode/cpp/calc_projections_c/calc_projections_c _LowLevelCode/cpp/combine_sqw _LowLevelCode/cpp/combine_sqw/TestCombineSQW _LowLevelCode/cpp/recompute_bin_data _LowLevelCode/cpp/sort_pixels_by_bins _LowLevelCode/cpp/sort_pixels_by_bins/sort_pixels_by_bins admin

[apache at svr2.nd.rl.ac.uk]

Author: Alex Buts
Date: Wed Jun 29 18:02:48 2016
New Revision: 1278

Modified:
   trunk/_LowLevelCode/build_all/CommonCode.h   (props changed)
   trunk/_LowLevelCode/build_all/build_all.cpp   (props changed)
   trunk/_LowLevelCode/build_all/build_all.sln   (props changed)
   trunk/_LowLevelCode/build_all/build_all.vcproj   (props changed)
   trunk/_LowLevelCode/build_all/build_all.vcxproj   (props changed)
   trunk/_LowLevelCode/build_all/build_all.vcxproj.filters   (props changed)
   trunk/_LowLevelCode/cpp/accumulate_cut_c/accumulate_cut_c.sln   (props changed)
   trunk/_LowLevelCode/cpp/accumulate_cut_c/accumulate_cut_c/accumulate_cut_c.cpp   (props changed)
   trunk/_LowLevelCode/cpp/accumulate_cut_c/accumulate_cut_c/accumulate_cut_c.h   (props changed)
   trunk/_LowLevelCode/cpp/accumulate_cut_c/accumulate_cut_c/accumulate_cut_c.vcproj   (props changed)
   trunk/_LowLevelCode/cpp/accumulate_cut_c/accumulate_cut_c/accumulate_cut_c.vcxproj   (props changed)
   trunk/_LowLevelCode/cpp/accumulate_cut_c/accumulate_cut_c/accumulate_cut_c.vcxproj.filters   (props changed)
   trunk/_LowLevelCode/cpp/accumulate_cut_c/accumulate_cut_c/linkoptions.def   (props changed)
   trunk/_LowLevelCode/cpp/bin_pixels_c/bin_pixels_c.sln   (props changed)
   trunk/_LowLevelCode/cpp/bin_pixels_c/bin_pixels_c/bin_pixels_c.cpp   (props changed)
   trunk/_LowLevelCode/cpp/bin_pixels_c/bin_pixels_c/bin_pixels_c.vcproj   (props changed)
   trunk/_LowLevelCode/cpp/bin_pixels_c/bin_pixels_c/bin_pixels_c.vcxproj   (props changed)
   trunk/_LowLevelCode/cpp/bin_pixels_c/bin_pixels_c/bin_pixels_c.vcxproj.filters   (props changed)
   trunk/_LowLevelCode/cpp/bin_pixels_c/bin_pixels_c/extract.c   (props changed)
   trunk/_LowLevelCode/cpp/bin_pixels_c/bin_pixels_c/extract.cpp   (props changed)
   trunk/_LowLevelCode/cpp/calc_projections_c/calc_projections_c.sln   (props changed)
   trunk/_LowLevelCode/cpp/calc_projections_c/calc_projections_c/calc_projections_c.cpp   (props changed)
   trunk/_LowLevelCode/cpp/calc_projections_c/calc_projections_c/calc_projections_c.h   (props changed)
   trunk/_LowLevelCode/cpp/calc_projections_c/calc_projections_c/calc_projections_c.vcproj   (props changed)
   trunk/_LowLevelCode/cpp/calc_projections_c/calc_projections_c/calc_projections_c.vcxproj   (props changed)
   trunk/_LowLevelCode/cpp/calc_projections_c/calc_projections_c/calc_projections_c.vcxproj.filters   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/TestCombineSQW/TestCombineSQW.cpp   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/TestCombineSQW/TestCombineSQW.h   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/TestCombineSQW/TestCombineSQW.sln   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/TestCombineSQW/TestCombineSQW.vcxproj   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/TestCombineSQW/TestCombineSQW.vcxproj.filters   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/TestCombineSQW/TestCombineSQW.vcxproj.user   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/TestCombineSQW/test_header.cpp   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/TestCombineSQW/test_header.h   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/combine_sqw.cpp   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/combine_sqw.h   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/combine_sqw.sln   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/combine_sqw.vcxproj   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/combine_sqw.vcxproj.filters   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/exchange_buffer.cpp   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/exchange_buffer.h   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/fileParameters.cpp   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/fileParameters.h   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/nsqw_pix_reader.cpp   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/nsqw_pix_reader.h   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/pix_mem_map.cpp   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/pix_mem_map.h   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/run_test_sqw_debug.m   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/sqw_pix_writer.cpp   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/sqw_pix_writer.h   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/sqw_reader.cpp   (props changed)
   trunk/_LowLevelCode/cpp/combine_sqw/sqw_reader.h   (contents, props changed)
   trunk/_LowLevelCode/cpp/recompute_bin_data/recompute_bin_data.h   (props changed)
   trunk/_LowLevelCode/cpp/recompute_bin_data/recompute_bin_data.sln   (props changed)
   trunk/_LowLevelCode/cpp/recompute_bin_data/recompute_bin_data.vcxproj   (props changed)
   trunk/_LowLevelCode/cpp/recompute_bin_data/recompute_bin_data.vcxproj.filters   (props changed)
   trunk/_LowLevelCode/cpp/recompute_bin_data/recompute_bin_data_c.cpp   (props changed)
   trunk/_LowLevelCode/cpp/sort_pixels_by_bins/sort_pixels_by_bins.sln   (props changed)
   trunk/_LowLevelCode/cpp/sort_pixels_by_bins/sort_pixels_by_bins/sort_pixels_by_bins.cpp   (props changed)
   trunk/_LowLevelCode/cpp/sort_pixels_by_bins/sort_pixels_by_bins/sort_pixels_by_bins.h   (props changed)
   trunk/_LowLevelCode/cpp/sort_pixels_by_bins/sort_pixels_by_bins/sort_pixels_by_bins.vcproj   (props changed)
   trunk/_LowLevelCode/cpp/sort_pixels_by_bins/sort_pixels_by_bins/sort_pixels_by_bins.vcxproj   (props changed)
   trunk/_LowLevelCode/cpp/sort_pixels_by_bins/sort_pixels_by_bins/sort_pixels_by_bins.vcxproj.filters   (props changed)
   trunk/admin/horace_version.m

Log:
Re #160 Making merge distinctive

Modified: trunk/_LowLevelCode/cpp/combine_sqw/sqw_reader.h
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/_LowLevelCode/cpp/combine_sqw/sqw_reader.h?r1=1277&r2=1278

Modified: trunk/admin/horace_version.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/admin/horace_version.m?r1=1277&r2=1278