diff options
author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-11-22 16:41:34 +0100 |
---|---|---|
committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-11-22 16:41:34 +0100 |
commit | a527cc9e29cae256bd095b032f34c80957e84907 (patch) | |
tree | e68dd547d6a88c188eca4798423adf084ba58124 /cuda/3d/cgls3d.h | |
parent | 6a7b605102f1c22224b516906cb4a848cda50a3b (diff) | |
parent | bd2798bed2fddfe00dac006013a9fb1363417f20 (diff) | |
download | astra-a527cc9e29cae256bd095b032f34c80957e84907.tar.gz astra-a527cc9e29cae256bd095b032f34c80957e84907.tar.bz2 astra-a527cc9e29cae256bd095b032f34c80957e84907.tar.xz astra-a527cc9e29cae256bd095b032f34c80957e84907.zip |
Merge branch 'master' into parallel_vec
Diffstat (limited to 'cuda/3d/cgls3d.h')
-rw-r--r-- | cuda/3d/cgls3d.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cuda/3d/cgls3d.h b/cuda/3d/cgls3d.h index e09fcfb..2ed2b1d 100644 --- a/cuda/3d/cgls3d.h +++ b/cuda/3d/cgls3d.h @@ -28,7 +28,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #ifndef _CUDA_CGLS3D_H #define _CUDA_CGLS3D_H -#include "util3d.h" #include "algo3d.h" namespace astraCUDA3d { |