- Timestamp:
- Apr 11, 2017 5:49:13 AM (8 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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 6ca9d90, 7b15990
- Parents:
- f028ca9 (diff), 14bb7a4 (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:
- Andrew Jackson <andrew.jackson@…> (04/11/17 05:49:13)
- git-committer:
- GitHub <noreply@…> (04/11/17 05:49:13)
- Location:
- docs
- Files:
-
- 2 added
- 5 edited
- 2 moved
Note: See TracChangeset
for help on using the changeset viewer.