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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update copyright years	Willem Jan Palenstijn	2021-10-27	20	-40/+40
\|
*	iMinds -> imec	Willem Jan Palenstijn	2018-01-24	20	-20/+20
\|
*	Update copyright date	Willem Jan Palenstijn	2018-01-24	20	-40/+40
\|
*	Update contact email	Willem Jan Palenstijn	2018-01-12	20	-20/+20
\|
*	Merge branch 'master' into parallel_vec	Willem Jan Palenstijn	2017-11-22	3	-3/+3
\|\
\| *	Fix outdated function call in matlab DART algorithm. (Thanks @NathanaelSix)	Willem Jan Palenstijn	2017-10-16	3	-3/+3
\| \|
* \|	Merge branch 'master' into parallel_vec	Willem Jan Palenstijn	2017-09-15	20	-54/+74
\|\\|
\| *	Update headers (website+2016)	Willem Jan Palenstijn	2016-11-28	20	-54/+74
\| \|
* \|	Merge remote-tracking branch 'upstream/master' into parallel_vec	Wim van Aarle	2015-05-26	2	-25/+30
\|/ \| \| \| \| \| \| \|	Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp
*	fixed matlab DART implementation	Wim van Aarle	2015-02-23	6	-82/+885
\| \| \| \|	some files were missing, cleaned up the rest
*	Sync DART version	Willem Jan Palenstijn	2015-01-30	22	-1303/+680
\|
*	Fix typo in 2D DART example script	Willem Jan Palenstijn	2013-07-02	1	-2/+2
\|
*	Update version to 1.3	Willem Jan Palenstijn	2013-07-01	18	-0/+2473