- Timestamp:
- Apr 9, 2018 7:44:02 AM (6 years ago)
- Branches:
- master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload
- Children:
- 94f074c4
- Parents:
- b09aee8 (diff), c16172d (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:
- Wojciech Potrzebowski <Wojciech.Potrzebowski@…> (04/09/18 07:44:02)
- git-committer:
- GitHub <noreply@…> (04/09/18 07:44:02)
- File:
-
- 1 edited