diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-09-16 12:01:02 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-09-16 12:01:02 +0200 |
| commit | 55cbaa5df6f91594b7cd69754e04c186c7c88c97 (patch) | |
| tree | b1456253660a7762df6868d1452a6d9480e25b19 /src/Float32Data3D.cpp | |
| parent | 7584ffbd6748bcca8c3f7ed2dc961be01f2fcfdc (diff) | |
| parent | 026aa46c5db24ddd687cec0fa6e056a2ee3790c5 (diff) | |
| download | astra-55cbaa5df6f91594b7cd69754e04c186c7c88c97.tar.gz astra-55cbaa5df6f91594b7cd69754e04c186c7c88c97.tar.bz2 astra-55cbaa5df6f91594b7cd69754e04c186c7c88c97.tar.xz astra-55cbaa5df6f91594b7cd69754e04c186c7c88c97.zip | |
Merge branch 'master' into volgeom3d
Conflicts:
src/CudaBackProjectionAlgorithm3D.cpp
Diffstat (limited to 'src/Float32Data3D.cpp')
0 files changed, 0 insertions, 0 deletions