csa/tomo/approximate/astra.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add CUDA parvec support	Willem Jan Palenstijn	2016-07-29	1	-1/+9
\|
*	Merge branch 'master' into parvec	Willem Jan Palenstijn	2016-07-28	1	-0/+11
\|\
\| *	Update Windows build files	Willem Jan Palenstijn	2015-12-04	1	-0/+2
\| \|
\| *	Add CompositeGeometryManager	Willem Jan Palenstijn	2015-12-04	1	-0/+9
\| \| \| \| \| \| \| \| \| \|	This handles FP and BP operations on multiple data objects at once, splitting them to fit in GPU memory where necessary.
* \|	Merge remote-tracking branch 'upstream/master' into parallel_vec	Wim van Aarle	2015-05-26	1	-92/+497
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp
\| *	Add MSVC project files	Willem Jan Palenstijn	2015-03-20	1	-2/+3
\| \|
\| *	Generate MSVC 2008/2012 project files with a Python script	Willem Jan Palenstijn	2015-03-19	1	-91/+495
\| \|
* \|	created parallel_vec geometry class	Wim van Aarle	2015-03-03	1	-1/+3
\|/
*	Untangle cuda and astra includes	Willem Jan Palenstijn	2015-03-02	1	-2/+4
\|
*	Updated Visual Studio 2012 project file	Wim van Aarle	2015-02-23	1	-2/+2
\| \| \| \|	removed freeimage.dll
*	Add VS2012 build files	Willem Jan Palenstijn	2014-12-04	1	-0/+439