Changeset 2bdf61a in sasview

Timestamp:

Jan 10, 2018 8:29:22 AM (7 years ago)

Author:

GitHub <noreply@…>

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:

a40e913

Parents:

31b9987 (diff), 1b605fb (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:

Jeff Krzywon <krzywon@…> (01/10/18 08:29:22)

git-committer:

GitHub <noreply@…> (01/10/18 08:29:22)

Message:

Merge pull request #138 from llimeht/tmp/thumbsdb

Remove Thumbs.db from repository

Files:

• .gitignore (modified) (1 diff)
• src/sas/sasgui/guiframe/images/Thumbs.db (deleted)
• installers/sasview.spec (modified) (1 prop)
• installers/version.txt (modified) (1 prop)
• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (1 prop)
• src/sas/sasview/images/dls_logo.png (modified) (1 prop) (previous)
• src/sas/sasview/images/tudelft_logo.png (modified) (1 prop) (previous)
• src/sas/sasview/test/1d_data/saxess_example.pdh (modified) (1 prop)

.gitignore

@@ -29 +29 @@
 default_categories.json
 /setup.cfg
+Thumbs.db
 
 # doc build