summaryrefslogtreecommitdiffstats
path: root/CMake
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2018-02-21 12:51:37 +0000
committerEdoardo Pasca <edo.paskino@gmail.com>2018-02-21 12:51:37 +0000
commit931560ddf753ffc11413f6535e36ba81fe3bf0d9 (patch)
tree40c745677f0a5dfc5fba88bdb9350eac674c02c5 /CMake
parent75917255b4f0b8aae2e6ce9492a75e0f749bfb3e (diff)
parent49423f47c7282672fea979cd122c063c0f5ee465 (diff)
downloadregularization-931560ddf753ffc11413f6535e36ba81fe3bf0d9.tar.gz
regularization-931560ddf753ffc11413f6535e36ba81fe3bf0d9.tar.bz2
regularization-931560ddf753ffc11413f6535e36ba81fe3bf0d9.tar.xz
regularization-931560ddf753ffc11413f6535e36ba81fe3bf0d9.zip
Merge branch 'GPU_test' of https://github.com/vais-ral/CCPi-FISTA_Reconstruction into GPU_test
Conflicts: Wrappers/Python/test/test_gpu_regularizers.py
Diffstat (limited to 'CMake')
0 files changed, 0 insertions, 0 deletions