Changeset cd5e29b in sasview for .gitignore

Timestamp:

Sep 1, 2015 9:20:05 AM (9 years ago)

Author:

ajj

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:

f0d720b

Parents:

40c5104 (diff), 600bea1 (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 'master' into sasmodels-integration

File:

• .gitignore (modified) (3 diffs)

.gitignore

@@ -12 +12 @@
 .project
 .pydevproject
+.vagrant
 .idea
 build
@@ -17 +18 @@
 sasview.egg-info
 sasview.egg-info
+
 .mplconfig
 doctrees
@@ -22 +24 @@
 build
 
-docs/sphinx-docs
+/dist
+**/build
+sasview.egg-info
+sasview-install
+**/test/logs
+*.pyc
+default_categories.json
 
-**/test/logs
-**/build
+/src/sas/models/*.py
+/src/sas/models/c_extension/c_models/c_models.cpp
+/src/sas/models/c_extension/python_wrapper/generated/
+/src/sas/models/media/.idea/
 
-*.pyc
-
-src/sas/models/*.py
-
-src/sas/models/c_extension/c_models/c_models.cpp
-src/sas/models/c_extension/python_wrapper/generated/
-src/sas/models/media/.idea/
+/docs/sphinx-docs/build
+/docs/sphinx-docs/source/dev/api
+/docs/sphinx-docs/source/user/guiframe
+/docs/sphinx-docs/source/user/models
+/docs/sphinx-docs/source/user/perspectives
 
 default_categories.json