Changeset aff7904 in sasview for sasview/setup_mac.py

Timestamp:

Apr 28, 2016 7:38:05 AM (8 years ago)

Author:

wojciech

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3371d81

Parents:

5881b17 (diff), 259aaa0 (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:

Conflicts fixed, merged with master

File:

• sasview/setup_mac.py (modified) (1 diff)

sasview/setup_mac.py

@@ -43 +43 @@
 import sas.sasgui.perspectives.invariant as invariant
 DATA_FILES += invariant.data_files()
-#import sas.models as models
 import sasmodels.models as models
 DATA_FILES += models.data_files()