-
Notifications
You must be signed in to change notification settings - Fork 122
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Re #6162. Returning the reverted code
- Loading branch information
1 parent
927a4d4
commit 96e7961
Showing
22 changed files
with
161 additions
and
311 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,31 @@ | ||
<RCC> | ||
<qresource prefix="/"> | ||
<file>pvIcon.png</file> | ||
<file>MantidSplashScreen.png</file> | ||
<file>MantidPlot_Icon_32offset.png</file> | ||
<file>SNS_logo_trans_back.gif</file> | ||
<file>Tessella_Logo_Transparent.gif</file> | ||
<file>Mantid_Logo_Transparent_Cropped.png</file> | ||
<file>HFIR_logo_small.png</file> | ||
<file>ISIS_Logo_Transparent.gif</file> | ||
<file>Mantid_Logo_Transparent.png</file> | ||
<file>data_replace.png</file> | ||
</qresource> | ||
<qresource prefix="/Icons"> | ||
<file>LoadFile.png</file> | ||
</qresource> | ||
<qresource prefix="/PickTools"> | ||
<file>selection-tube.png</file> | ||
<file>selection-box.png</file> | ||
<file>selection-circle.png</file> | ||
<file>selection-pointer.png</file> | ||
<file>selection-text.png</file> | ||
<file>selection-peak.png</file> | ||
</qresource> | ||
<qresource prefix="/MaskTools"> | ||
<file>selection-pointer.png</file> | ||
<file>selection-circle.png</file> | ||
<file>selection-box.png</file> | ||
</qresource> | ||
<qresource prefix="/"> | ||
<file>pvIcon.png</file> | ||
<file>MantidSplashScreen.png</file> | ||
<file>MantidPlot_Icon_32offset.png</file> | ||
<file>SNS_logo_trans_back.gif</file> | ||
<file>Tessella_Logo_Transparent.gif</file> | ||
<file>Mantid_Logo_Transparent_Cropped.png</file> | ||
<file>HFIR_logo_small.png</file> | ||
<file>ISIS_Logo_Transparent.gif</file> | ||
<file>Mantid_Logo_Transparent.png</file> | ||
<file>data_replace.png</file> | ||
</qresource> | ||
<qresource prefix="/Icons"> | ||
<file>LoadFile.png</file> | ||
</qresource> | ||
<qresource prefix="/PickTools"> | ||
<file>selection-tube.png</file> | ||
<file>selection-box.png</file> | ||
<file>selection-circle.png</file> | ||
<file>selection-pointer.png</file> | ||
<file>selection-text.png</file> | ||
<file>selection-peak.png</file> | ||
<file>selection-peaks.png</file> | ||
</qresource> | ||
<qresource prefix="/MaskTools"> | ||
<file>selection-pointer.png</file> | ||
<file>selection-circle.png</file> | ||
<file>selection-box.png</file> | ||
</qresource> | ||
</RCC> |
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 0 additions & 57 deletions
57
Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/DetSelector.cpp
This file was deleted.
Oops, something went wrong.
68 changes: 0 additions & 68 deletions
68
Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/DetSelector.h
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.