Changeset 1248c33 in sasview
- Timestamp:
- Dec 14, 2016 12:48:29 AM (7 years ago)
- 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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- ec57735
- Parents:
- 5dab2bc (diff), 4dd8d25 (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:
- wpotrzebowski <Wojciech.Potrzebowski@…> (12/14/16 00:48:19)
- git-committer:
- wpotrzebowski <Wojciech.Potrzebowski@…> (12/14/16 00:48:29)
- Files:
-
- 1 added
- 2 edited
-
sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added)
-
build_tools/jenkins_osx_build.sh (modified) (1 diff)
-
build_tools/jenkins_win_build.bat (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
build_tools/jenkins_osx_build.sh
r8ca1ba1 r5dab2bc 40 40 cd sasmodels 41 41 $PYTHON setup.py bdist_egg 42 42 $PYTHON -m sasmodels.model_test all 43 43 44 44 # SASVIEW -
build_tools/jenkins_win_build.bat
rb188f53 r5dab2bc 48 48 cd sasmodels 49 49 %PYTHON% setup.py bdist_egg 50 50 %PYTHON% -m sasmodels.model_test all 51 51 52 52 :: SASMODELS install egg ##############################################
Note: See TracChangeset
for help on using the changeset viewer.
