Merge branch 'master' of https://git.rwth-aachen.de/ita/ITACoreLibs

cc9811aa · Dipl.-Ing. Jonas Stienen · 03d4d6fb · fdbb0d70 · cc9811aa · cc9811aa
Commit cc9811aa authored May 26, 2017 by Dipl.-Ing. Jonas Stienen
Showing with 10 additions and 5 deletions

.gitmodules .gitmodules +3 -0

CMakeLists.txt CMakeLists.txt +2 -1

ITABase ITABase +1 -1

ITADSP ITADSP +1 -0

ITAFFT ITAFFT +1 -1

ITASampler ITASampler +1 -1

ITAStreaming ITAStreaming +1 -1

No files found.
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "ITAStreaming"]
 	path = ITAStreaming
 	url = https://git.rwth-aachen.de/ita/ITAStreaming.git
+[submodule "ITADSP"]
+	path = ITADSP
+	url = https://git.rwth-aachen.de/ita/ITADSP
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,8 @@ endif()
 set( ITA_CORE_LIBS_COMMON_BUILD TRUE )
 add_subdirectory( ITABase )
 add_subdirectory( ITAFFT )
-add_subdirectory( ITAStreaming )
+add_subdirectory( ITADSP )
+add_subdirectory( ITASampler )
 add_subdirectory( ITADataSources )
 add_subdirectory( ITAConvolution )
 add_subdirectory( ITADSP )

--- a/ITABase @ c74d9f0c
+++ b/ITABase @ c74d9f0c
-Subproject commit bc3fe95c2641f69a5217bef29be6b55dc3d3d00f
+Subproject commit c74d9f0c6a09edcb3f53053bb2973bc880ea79f7
--- a/ITADSP @ 62c3c542
+++ b/ITADSP @ 62c3c542
+Subproject commit 62c3c54291ebf8d4ced2275f558e2928e7dce979
--- a/ITAFFT @ 7971141a
+++ b/ITAFFT @ 7971141a
-Subproject commit 13ac1ee9c248abac9b6377e89077159c940823f4
+Subproject commit 7971141a56c64600a22ae5004d84f2c22ea97196
--- a/ITASampler @ eec6cf4a
+++ b/ITASampler @ eec6cf4a
-Subproject commit a5003dd4fedbeb1693fe01939ff33b1030c29500
+Subproject commit eec6cf4a028138bdd9d7087db42d98bc2f331b6d
--- a/ITAStreaming @ 46f56525
+++ b/ITAStreaming @ 46f56525
-Subproject commit 8c973c6fd788e56a9e5c6a4fdaeea6ccd6fc3074
+Subproject commit 46f56525d73fd95513004d0448caaaeb9398ba6e