Changeset 3c6ecd9 in sasview for src/sas/qtgui/MainWindow/media

Timestamp:

May 7, 2018 6:47:21 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

42787fb

Parents:

b0ba43e (diff), 80468f6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' into ESS_GUI_Pr

Location:

src/sas/qtgui/MainWindow/media

Files:

• BatchGridClassLayout.png (moved) (moved from src/sas/sasgui/guiframe/media/BatchGridClassLayout.png) (1 prop)
• M_angles_pic.png (moved) (moved from src/sas/sasgui/guiframe/media/M_angles_pic.png) (1 prop)
• data_explorer_help.rst (moved) (moved from src/sas/sasgui/guiframe/media/data_explorer_help.rst) (1 prop)
• data_formats_help.rst (moved) (moved from src/sas/sasgui/guiframe/media/data_formats_help.rst) (1 prop)
• graph_help.rst (moved) (moved from src/sas/sasgui/guiframe/media/graph_help.rst) (1 prop)
• guinier_fit.png (moved) (moved from src/sas/sasgui/guiframe/media/guinier_fit.png) (1 prop)
• hand_menu.png (moved) (moved from src/sas/sasgui/guiframe/media/hand_menu.png) (1 prop)