Changeset f07d8ab in sasview for .gitignore

Timestamp:

Sep 8, 2018 6:09:29 AM (6 years ago)

Author:

Laura Forster <Awork@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

c4b23dd

Parents:

a2e8ea5 (diff), 7cc38a7 (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.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

File:

• .gitignore (modified) (1 diff)

.gitignore

@@ -16 +16 @@
 *.pyproj
 *.sln
+.*.swp
 .DS_Store
 /.settings