Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into master | Tomas Kulhanek | 2019-01-28 | 4 | -16/+14 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/vais-ral/CCPi-Regularisation-Toolkit | vagrant | 2019-01-28 | 13 | -26/+45 |
| |\ | | | | | | | | | | | | | Conflicts: build/jenkins-build.sh | ||||
| | * | Merge pull request #93 from vais-ral/wincudafix | Edoardo Pasca | 2019-01-24 | 4 | -16/+14 |
| | |\ | | | | | | | | | fixes gpu build on windows | ||||
| | | * | fixes gpu build on windows | Kazantsev | 2019-01-23 | 4 | -16/+14 |
| | | | | |||||
| | * | | Merge pull request #92 from TomasKulhanek/master | Tomas Kulhanek | 2019-01-23 | 2 | -26/+38 |
| | |\ \ | | | |/ | | |/| | build scripts detects tag and branch | ||||
| | * | | Merge pull request #88 from TomasKulhanek/pr-test | Tomas Kulhanek | 2019-01-21 | 7 | -9/+33 |
| | |\ \ | | | | | | | | | | | Pr test | ||||
| * | | | | UPDATE: calling universa build script | vagrant | 2019-01-28 | 1 | -28/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' of ↵ | Kulhanek | 2019-01-28 | 1 | -1/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | https://github.com/TomasKulhanek/CCPi-Regularisation-Toolkit | ||||
| * \ \ \ \ | Merge pull request #7 from TomasKulhanek/pr2test | Tomas Kulhanek | 2019-01-25 | 1 | -1/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Update Readme.md | ||||
| | * | | | | | Update Readme.md | Tomas Kulhanek | 2019-01-23 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Update Readme.md | Tomas Kulhanek | 2019-01-23 | 1 | -1/+2 |
| | | |_|_|/ | | |/| | | | |||||
* | / | | | | UPDATE: using universal build | Kulhanek | 2019-01-28 | 1 | -93/+1 |
|/ / / / / | |||||
* | | | | | UPDATE: documentation of build script | Kulhanek | 2019-01-24 | 1 | -1/+23 |
| | | | | | |||||
* | | | | | UPDATE: branch taken from symbolic-full-name | Kulhanek | 2019-01-24 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #4 from TomasKulhanek/pr-test | Tomas Kulhanek | 2019-01-23 | 1 | -22/+30 |
|\ \ \ \ | | | | | | | | | | | Pr test | ||||
| * | | | | UPDATE 6: minor | Tomas Kulhanek | 2019-01-22 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | UPDATE 5: minor | Tomas Kulhanek | 2019-01-22 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | UPDATE 4: check git branch | Tomas Kulhanek | 2019-01-22 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | UPDATE 3: check git branch | Tomas Kulhanek | 2019-01-22 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | UPDATE 2: check git branch, upload master build | Tomas Kulhanek | 2019-01-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | UPDATE 2: check git branch, upload master build | Tomas Kulhanek | 2019-01-22 | 1 | -14/+16 |
| | | | | | |||||
| * | | | | UPDATE: check git branch, upload master build | Tomas Kulhanek | 2019-01-22 | 1 | -2/+5 |
| | | | | | |||||
| * | | | | Update jenkins-build.sh | Tomas Kulhanek | 2019-01-22 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into pr-test | Tomas Kulhanek | 2019-01-22 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| * | | | | | Update jenkins-build.sh | Tomas Kulhanek | 2019-01-22 | 1 | -2/+4 |
| | | | | | | |||||
| * | | | | | Update jenkins-build.sh | Tomas Kulhanek | 2019-01-22 | 1 | -7/+6 |
| | | | | | | |||||
* | | | | | | Update Readme.md | Tomas Kulhanek | 2019-01-23 | 1 | -2/+3 |
| | | | | | | |||||
* | | | | | | Update Readme.md | Tomas Kulhanek | 2019-01-23 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Update Readme.md | Tomas Kulhanek | 2019-01-23 | 1 | -1/+2 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #3 from TomasKulhanek/pr-test | Tomas Kulhanek | 2019-01-22 | 1 | -14/+15 |
|\| | | | | | | | | | | | | | | Update jenkins-build.sh test 32 | ||||
| * | | | | Update jenkins-build.sh | Tomas Kulhanek | 2019-01-22 | 1 | -14/+15 |
| | | | | | |||||
* | | | | | Merge pull request #2 from TomasKulhanek/pr-test | Tomas Kulhanek | 2019-01-22 | 1 | -13/+13 |
|\| | | | | | | | | | | | | | | Update jenkins-build.sh test | ||||
| * | | | | Update jenkins-build.sh | Tomas Kulhanek | 2019-01-22 | 1 | -13/+13 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1 from TomasKulhanek/pr-test | Tomas Kulhanek | 2019-01-21 | 2 | -6/+4 |
|\| | | | | | | | | | | | Pr test | ||||
| * | | | Merge branch 'master' into pr-test | Tomas Kulhanek | 2019-01-21 | 2 | -5/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | added jenkins build status | Edoardo Pasca | 2019-01-15 | 1 | -0/+1 |
| | | | | |||||
| | * | | version in top 0.10.4 | vagrant | 2019-01-09 | 1 | -8/+7 |
| | | | | |||||
| | * | | fix | vagrant | 2019-01-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | pr-test | vagrant | 2019-01-21 | 1 | -1/+0 |
| | | | | |||||
* | | | | test | vagrant | 2019-01-21 | 1 | -0/+1 |
|/ / / | |||||
* | | | UPDATE: build | vagrant | 2019-01-21 | 2 | -2/+2 |
| | | | |||||
* | | | UPDATE: propagate CIL_VERSION | vagrant | 2019-01-21 | 7 | -6/+10 |
| | | | |||||
* | | | typo | vagrant | 2019-01-21 | 1 | -1/+1 |
| | | | |||||
* | | | UPDATE: version from env | vagrant | 2019-01-21 | 1 | -1/+3 |
| | | | |||||
* | | | UPDATE: conda build don't like dash in version | vagrant | 2019-01-21 | 1 | -1/+3 |
| | | | |||||
* | | | echo version | vagrant | 2019-01-21 | 1 | -3/+3 |
| | | | |||||
* | | | typo | vagrant | 2019-01-21 | 1 | -1/+1 |
| | | | |||||
* | | | UPDATE: CIL_VERSION from git tag, dash in version is assumed as dev version | vagrant | 2019-01-21 | 1 | -5/+16 |
| | | | |||||
* | | | UPDATE: detect git version | vagrant | 2019-01-21 | 1 | -2/+5 |
| | | | |||||
* | | | ADD: TODOs | Tomas Kulhanek | 2019-01-15 | 1 | -0/+4 |
| | | |