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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into parallel_vec	Willem Jan Palenstijn	2017-09-15	1	-4/+3
\|\
\| *	Update headers (website+2016)	Willem Jan Palenstijn	2016-11-28	1	-4/+3
\| \|
* \|	Add CUDA parvec support	Willem Jan Palenstijn	2016-07-29	1	-10/+8
\| \|
* \|	Merge branch 'master' into parvec	Willem Jan Palenstijn	2016-07-28	1	-3/+2
\|\\|
\| *	Replace boost::lexical_cast by stringstreams	Willem Jan Palenstijn	2016-01-05	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \|	This is to avoid the dependence of lexical_cast on the current locale. The stringstreams used for the new string parsing/output functions are explicitly imbued with the C/classic locale.
* \|	Merge remote-tracking branch 'upstream/master' into parallel_vec	Wim van Aarle	2015-05-26	1	-12/+10
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp
\| *	Change XMLNode* to XMLNode	Willem Jan Palenstijn	2015-05-06	1	-12/+10
\| \| \| \| \| \| \| \|	An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes.
* \|	updated 'line_fanflat' projector	Wim van Aarle	2015-03-12	1	-0/+18
\|/
*	get_geometry now uses XML config object (for projections)	Wim van Aarle	2015-02-26	1	-0/+14
\|
*	Update copyright to -2015	Willem Jan Palenstijn	2015-01-26	1	-2/+2
\|
*	Update copyright headers	Willem Jan Palenstijn	2015-01-19	1	-5/+5
\|
*	Update version to 1.3	Willem Jan Palenstijn	2013-07-01	1	-0/+209