diff options
| author | Tomas Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-02-22 07:50:37 -0500 |
|---|---|---|
| committer | Tomas Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-02-22 07:50:37 -0500 |
| commit | 755b74b26f07f91fbffd19f3476da1f6ac16d774 (patch) | |
| tree | 4bb4cf8c7576aa1773f0f5e8aa9600fc5a01ea64 /Readme.md | |
| parent | c237d292999c93df09ca3679876d225896dd0ff9 (diff) | |
| parent | 9b4058fbf779221ed7d37bfc6e7c838b294c5965 (diff) | |
| download | regularization-755b74b26f07f91fbffd19f3476da1f6ac16d774.tar.gz regularization-755b74b26f07f91fbffd19f3476da1f6ac16d774.tar.bz2 regularization-755b74b26f07f91fbffd19f3476da1f6ac16d774.tar.xz regularization-755b74b26f07f91fbffd19f3476da1f6ac16d774.zip | |
Merge remote-tracking branch 'remotes/origin/master' into newdirstructure
Conflicts:
demos/demoMatlab_denoise.m
demos/qualitymetrics.py
Diffstat (limited to 'Readme.md')
| -rw-r--r-- | Readme.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -109,7 +109,7 @@ conda install ccpi-regulariser -c ccpi -c conda-forge #### Python (conda-build) ``` - export CIL_VERSION=0.10.4 + export CIL_VERSION=19.02 conda build Wrappers/Python/conda-recipe --numpy 1.12 --python 3.5 conda install ccpi-regulariser=${CIL_VERSION} --use-local --force cd demos/ |