Timestamp:
Apr 10, 2017 1:00:32 PM (8 years ago)
Author:
krzywon
Branches:
master, 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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
6e6dd4c
Parents:
6267876
git-author:
Jeff Krzywon <krzywon@…> (04/10/17 13:00:32)
git-committer:
krzywon <krzywon@…> (04/10/17 13:00:32)
Message:

Resolve merge conflicts and 2 small fixes to slicer panel. #467

(No files)

Note: See TracChangeset for help on using the changeset viewer.