# 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.

Merge done to enable documentation be be fixed, because of removal of
alias directive and addition of related algorithms directive.

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

re #18885

Refs #17513

re #14524

This should allow the logger.is functionality to work correctly.

re #14524

re #12703

Dan Nixon authored 9 years ago and Hahn, Steven committed 9 years ago

Refs #9067

Refs #9067

along with associated classes and references thereto.

Now that we only support 64 bit we can just fall back on swap when
memory runs out.

Refs #9059

It doesn't like the fstream std::string constructor

This will help ensure that for the system tests we can reset the config
once it has loaded and only save keys that we change just in case an old
config was not restored.

on your local developer machine

Ubuntu 11.10 comes with gcc 4.6 and a new warning -Wset-but-unused. Might as well get rid of these now.

Refs #3332 Implemented a send to options tab on the preference dialog where a user can control what programs a workspace can be sent to. Add and Edit buttons open a seperate dialog containing a form with validation to make sure the user enters the correct information.

bug in configservice test.  Tests were affected by values in previous tests.

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.