Changeset 88d7032 in sasview

Timestamp:

Oct 23, 2015 3:15:21 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d7b4decd

Parents:

7706c5c (diff), 98f3234 (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 pull request #5 from pavoljuhas/master

Purge generated files

Files:

• .gitignore (modified) (2 diffs)
• setup.cfg (deleted)
• test/pr_inversion/test/test_output.txt (deleted)
• test/sasdataloader/test/plugins.zip (deleted)
• test/sasdataloader/test/test_log.txt (deleted)

.gitignore

@@ -14 +14 @@
 .vagrant
 .mplconfig
+
+/setup.cfg
 
 /dist
@@ -34 +36 @@
 /docs/sphinx-docs/source/user/perspectives
 
+# test outputs
+/test/pr_inversion/test/test_output.txt
+/test/sasdataloader/test/plugins.zip
+/test/sasdataloader/test/test_log.txt