- Timestamp:
- Jan 9, 2018 3:10:31 PM (7 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:
- 2bdf61a
- Parents:
- 2b442811 (diff), af7d2e5 (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:
- Mathieu Doucet <matd10@…> (01/09/18 15:10:31)
- git-committer:
- GitHub <noreply@…> (01/09/18 15:10:31)
- (No files)
-
Note: See TracChangeset
for help on using the changeset viewer.