[Horace-svn] r1098 - branches/IO_on_parallelFS_br153/sqw/@sqw/private branches/IO_on_parallelFS_br153/sqw/coord_transform/@projection trunk trunk/sqw/@sqw trunk/sqw/@sqw/private

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

Author: Alex Buts
Date: Mon Dec  7 20:51:24 2015
New Revision: 1098

Added:
   branches/IO_on_parallelFS_br153/sqw/@sqw/private/get_sqw.m
      - copied unchanged from r1097, /branches/IO_on_parallelFS_br153/sqw/@sqw/private/get_sqw.m
Modified:
   branches/IO_on_parallelFS_br153/sqw/coord_transform/@projection/   (props changed)
   trunk/spaghetti_plot.m
   trunk/sqw/@sqw/gen_sqw.m
   trunk/sqw/@sqw/private/calc_sqw.m

Log:
Re #153 Merging master into the branch

Modified: trunk/spaghetti_plot.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/spaghetti_plot.m?r1=1097&r2=1098

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

Modified: trunk/sqw/@sqw/private/calc_sqw.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/sqw/%40sqw/private/calc_sqw.m?r1=1097&r2=1098