Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |