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 /build/linux | |
| 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 'build/linux')
| -rw-r--r-- | build/linux/Makefile.in | 3 | ||||
| -rw-r--r-- | build/linux/configure.ac | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index d7d6488..77e89e7 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -181,8 +181,7 @@ BASE_OBJECTS=\ src/VolumeGeometry2D.lo \ src/VolumeGeometry3D.lo \ src/XMLDocument.lo \ - src/XMLNode.lo \ - src/swrap.lo + src/XMLNode.lo CUDA_CXX_OBJECTS=\ src/CudaProjector2D.lo \ diff --git a/build/linux/configure.ac b/build/linux/configure.ac index b95d94f..0091388 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -23,7 +23,7 @@ dnl along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. dnl dnl ----------------------------------------------------------------------- -AC_INIT(astra, 1.8.0) +AC_INIT(astra, 1.8.3) AC_CONFIG_SRCDIR([Makefile.in]) LT_INIT([disable-static]) |