diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:15 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:43 +0100 |
| commit | db7e26bc73fd71bc88249131f57f7edef308fa63 (patch) | |
| tree | d084ad2615012d53c50a230821761349eb978d56 /gr-fft | |
| parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) | |
| parent | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-fft')
| -rw-r--r-- | gr-fft/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-fft/docs/CMakeLists.txt (renamed from gr-fft/doc/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | gr-fft/docs/README.fft (renamed from gr-fft/doc/README.fft) | 0 | ||||
| -rw-r--r-- | gr-fft/docs/fft.dox (renamed from gr-fft/doc/fft.dox) | 0 |
4 files changed, 1 insertions, 1 deletions
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt index 087b11a995..992ca5ca86 100644 --- a/gr-fft/CMakeLists.txt +++ b/gr-fft/CMakeLists.txt @@ -57,7 +57,7 @@ if(ENABLE_PYTHON) add_subdirectory(python/fft) add_subdirectory(grc) endif(ENABLE_PYTHON) -add_subdirectory(doc) +add_subdirectory(docs) ######################################################################## # Create Pkg Config File diff --git a/gr-fft/doc/CMakeLists.txt b/gr-fft/docs/CMakeLists.txt index 96c42f030f..96c42f030f 100644 --- a/gr-fft/doc/CMakeLists.txt +++ b/gr-fft/docs/CMakeLists.txt diff --git a/gr-fft/doc/README.fft b/gr-fft/docs/README.fft index 3ea9e81f8b..3ea9e81f8b 100644 --- a/gr-fft/doc/README.fft +++ b/gr-fft/docs/README.fft diff --git a/gr-fft/doc/fft.dox b/gr-fft/docs/fft.dox index 9ddf30d389..9ddf30d389 100644 --- a/gr-fft/doc/fft.dox +++ b/gr-fft/docs/fft.dox |