[Horace-svn] r1383 - in trunk/sqw: @data_sqw_dnd @sqw @sqw/private file_io file_io/@dnd_binfile_common file_io/@dnd_file_interface

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

Author: Alex Buts
Date: Thu Dec 15 14:23:03 2016
New Revision: 1383

Added:
   trunk/sqw/@sqw/private/get_instrument_field.m
Modified:
   trunk/sqw/@data_sqw_dnd/data_sqw_dnd.m
   trunk/sqw/@sqw/get_mod_pulse.m
   trunk/sqw/@sqw/head.m
   trunk/sqw/file_io/@dnd_binfile_common/dnd_binfile_common.m
   trunk/sqw/file_io/@dnd_file_interface/dnd_file_interface.m
   trunk/sqw/file_io/@dnd_file_interface/get_file_header.m
   trunk/sqw/file_io/Contents.m
   trunk/sqw/file_io/sqw_formats_factory.m

Log:
Re #162 bug in head and merge conflict. 


Modified: trunk/sqw/@data_sqw_dnd/data_sqw_dnd.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/sqw/%40data_sqw_dnd/data_sqw_dnd.m?r1=1382&r2=1383

Modified: trunk/sqw/@sqw/get_mod_pulse.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/sqw/%40sqw/get_mod_pulse.m?r1=1382&r2=1383

Modified: trunk/sqw/@sqw/head.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/sqw/%40sqw/head.m?r1=1382&r2=1383

Added: trunk/sqw/@sqw/private/get_instrument_field.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/sqw/%40sqw/private/get_instrument_field.m?view=markup&revision=1383

Modified: trunk/sqw/file_io/@dnd_binfile_common/dnd_binfile_common.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/sqw/file_io/%40dnd_binfile_common/dnd_binfile_common.m?r1=1382&r2=1383

Modified: trunk/sqw/file_io/@dnd_file_interface/dnd_file_interface.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/sqw/file_io/%40dnd_file_interface/dnd_file_interface.m?r1=1382&r2=1383

Modified: trunk/sqw/file_io/@dnd_file_interface/get_file_header.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/sqw/file_io/%40dnd_file_interface/get_file_header.m?r1=1382&r2=1383

Modified: trunk/sqw/file_io/Contents.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/sqw/file_io/Contents.m?r1=1382&r2=1383

Modified: trunk/sqw/file_io/sqw_formats_factory.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/sqw/file_io/sqw_formats_factory.m?r1=1382&r2=1383