summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into masterTomas Kulhanek2019-01-284-16/+14
|\
| * Merge branch 'master' of https://github.com/vais-ral/CCPi-Regularisation-Toolkitvagrant2019-01-2813-26/+45
| |\ | | | | | | | | | | | | Conflicts: build/jenkins-build.sh
| | * Merge pull request #93 from vais-ral/wincudafixEdoardo Pasca2019-01-244-16/+14
| | |\ | | | | | | | | fixes gpu build on windows
| | | * fixes gpu build on windowsKazantsev2019-01-234-16/+14
| | | |
| | * | Merge pull request #92 from TomasKulhanek/masterTomas Kulhanek2019-01-232-26/+38
| | |\ \ | | | |/ | | |/| build scripts detects tag and branch
| | * | Merge pull request #88 from TomasKulhanek/pr-testTomas Kulhanek2019-01-217-9/+33
| | |\ \ | | | | | | | | | | Pr test
| * | | | UPDATE: calling universa build scriptvagrant2019-01-281-28/+1
| | | | |
* | | | | Merge branch 'master' of ↵Kulhanek2019-01-281-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/TomasKulhanek/CCPi-Regularisation-Toolkit
| * \ \ \ \ Merge pull request #7 from TomasKulhanek/pr2testTomas Kulhanek2019-01-251-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | Update Readme.md
| | * | | | | Update Readme.mdTomas Kulhanek2019-01-231-0/+2
| | | | | | |
| | * | | | | Update Readme.mdTomas Kulhanek2019-01-231-1/+2
| | | |_|_|/ | | |/| | |
* | / | | | UPDATE: using universal buildKulhanek2019-01-281-93/+1
|/ / / / /
* | | | | UPDATE: documentation of build scriptKulhanek2019-01-241-1/+23
| | | | |
* | | | | UPDATE: branch taken from symbolic-full-nameKulhanek2019-01-241-2/+2
|/ / / /
* | | | Merge pull request #4 from TomasKulhanek/pr-testTomas Kulhanek2019-01-231-22/+30
|\ \ \ \ | | | | | | | | | | Pr test
| * | | | UPDATE 6: minorTomas Kulhanek2019-01-221-0/+1
| | | | |
| * | | | UPDATE 5: minorTomas Kulhanek2019-01-221-1/+0
| | | | |
| * | | | UPDATE 4: check git branchTomas Kulhanek2019-01-221-1/+2
| | | | |
| * | | | UPDATE 3: check git branchTomas Kulhanek2019-01-221-3/+4
| | | | |
| * | | | UPDATE 2: check git branch, upload master buildTomas Kulhanek2019-01-221-1/+1
| | | | |
| * | | | UPDATE 2: check git branch, upload master buildTomas Kulhanek2019-01-221-14/+16
| | | | |
| * | | | UPDATE: check git branch, upload master buildTomas Kulhanek2019-01-221-2/+5
| | | | |
| * | | | Update jenkins-build.shTomas Kulhanek2019-01-221-2/+1
| | | | |
| * | | | Merge branch 'master' into pr-testTomas Kulhanek2019-01-221-0/+2
| |\ \ \ \
| * | | | | Update jenkins-build.shTomas Kulhanek2019-01-221-2/+4
| | | | | |
| * | | | | Update jenkins-build.shTomas Kulhanek2019-01-221-7/+6
| | | | | |
* | | | | | Update Readme.mdTomas Kulhanek2019-01-231-2/+3
| | | | | |
* | | | | | Update Readme.mdTomas Kulhanek2019-01-231-1/+1
| | | | | |
* | | | | | Update Readme.mdTomas Kulhanek2019-01-231-1/+2
| |/ / / / |/| | | |
* | | | | Merge pull request #3 from TomasKulhanek/pr-testTomas Kulhanek2019-01-221-14/+15
|\| | | | | | | | | | | | | | Update jenkins-build.sh test 32
| * | | | Update jenkins-build.shTomas Kulhanek2019-01-221-14/+15
| | | | |
* | | | | Merge pull request #2 from TomasKulhanek/pr-testTomas Kulhanek2019-01-221-13/+13
|\| | | | | | | | | | | | | | Update jenkins-build.sh test
| * | | | Update jenkins-build.shTomas Kulhanek2019-01-221-13/+13
| | |_|/ | |/| |
* | | | Merge pull request #1 from TomasKulhanek/pr-testTomas Kulhanek2019-01-212-6/+4
|\| | | | | | | | | | | Pr test
| * | | Merge branch 'master' into pr-testTomas Kulhanek2019-01-212-5/+4
| |\ \ \ | | | |/ | | |/|
| | * | added jenkins build statusEdoardo Pasca2019-01-151-0/+1
| | | |
| | * | version in top 0.10.4vagrant2019-01-091-8/+7
| | | |
| | * | fixvagrant2019-01-091-1/+1
| | | |
| * | | pr-testvagrant2019-01-211-1/+0
| | | |
* | | | testvagrant2019-01-211-0/+1
|/ / /
* | | UPDATE: buildvagrant2019-01-212-2/+2
| | |
* | | UPDATE: propagate CIL_VERSIONvagrant2019-01-217-6/+10
| | |
* | | typovagrant2019-01-211-1/+1
| | |
* | | UPDATE: version from envvagrant2019-01-211-1/+3
| | |
* | | UPDATE: conda build don't like dash in versionvagrant2019-01-211-1/+3
| | |
* | | echo versionvagrant2019-01-211-3/+3
| | |
* | | typovagrant2019-01-211-1/+1
| | |
* | | UPDATE: CIL_VERSION from git tag, dash in version is assumed as dev versionvagrant2019-01-211-5/+16
| | |
* | | UPDATE: detect git versionvagrant2019-01-211-2/+5
| | |
* | | ADD: TODOsTomas Kulhanek2019-01-151-0/+4
| | |