# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Refs #16028

Eradicate IInstrument. Instrument's the one to talk to now (it was the only descendent class anyway). Re #2041.

Refs #3157 Sort our System.h. It was becoming a dumping ground. It should only be touched when absolutely necessary as it affects every file in Mantid. Also combined this with Refs #2345 to sort out DLLExport/DLLImport usage. It's done for Kernel, Geometry and API but stuff in the plugins could do with updating as well.

Rename Framework code directory to just that. Also delete Main and VS & Eclipse project file. Re #1881.

Move the Instrument and Instrument interface classes down to Geometry. The new raytracing framework needs instrument access and it should all be in geometry. Also, given that everything else was defined in geometry it seems to make more sense to have it all in one place. Re #1212

Copyright updated to read
Copyright © 2007-10 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory

dllexport changes for windows

Create an Instrument Data Service. Also created base class for Data Service from which all services should inherit.