Changeset d76c43a in sasview for src/sas/sasgui/guiframe/config.py
- Timestamp:
- Sep 20, 2017 4:39:48 PM (7 years ago)
- 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- fca1f50, 793713d
- Parents:
- ce0a245 (diff), f80b416e (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. - git-author:
- Paul Kienzle <pkienzle@…> (09/20/17 16:39:48)
- git-committer:
- GitHub <noreply@…> (09/20/17 16:39:48)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/guiframe/config.py
rce2819b rf80b416e 77 77 _nsf_logo = os.path.join(icon_path, "nsf_logo.png") 78 78 _danse_logo = os.path.join(icon_path, "danse_logo.png") 79 _inst_logo = os.path.join(icon_path, "utlogo. gif")79 _inst_logo = os.path.join(icon_path, "utlogo.png") 80 80 _nist_url = "http://www.nist.gov/" 81 81 _umd_url = "http://www.umd.edu/"
Note: See TracChangeset
for help on using the changeset viewer.