- Timestamp:
- May 11, 2017 7:23:41 AM (8 years ago)
- Branches:
- master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 40ecc42
- Parents:
- 8fbf8d6 (diff), 658dd57 (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. - Location:
- docs
- Files:
-
- 2 added
- 5 edited
- 2 moved
Note: See TracChangeset
for help on using the changeset viewer.