diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 23:05:12 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 23:05:12 -0500 |
| commit | 682b7c7c601446b64670f5041fa995ecffa06542 (patch) | |
| tree | a642e64b1ed1aabab5fc61119f4e7f6c57ae835e /gr-blocks/include/blocks/CMakeLists.txt | |
| parent | ff9e66ad7c9f22bf2741e760940bb6609848ede8 (diff) | |
| parent | 4c164f4cbb7fc9284bec147809b078d0a8ed9f88 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-blocks/python/qa_argmax.py
gr-blocks/python/qa_max.py
Diffstat (limited to 'gr-blocks/include/blocks/CMakeLists.txt')
| -rw-r--r-- | gr-blocks/include/blocks/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt index fdf3b08766..deebbdd6b7 100644 --- a/gr-blocks/include/blocks/CMakeLists.txt +++ b/gr-blocks/include/blocks/CMakeLists.txt @@ -69,8 +69,10 @@ expand_h(add_const_XX ss ii ff cc) expand_h(add_const_vXX ss ii ff cc) expand_h(and_XX bb ss ii) expand_h(and_const_XX bb ss ii) +expand_h(argmax_XX fs is ss) expand_h(divide_XX ss ii ff cc) expand_h(integrate_XX ss ii ff cc) +expand_h(max_XX ff ii ss) expand_h(multiply_XX ss ii) expand_h(multiply_const_XX ss ii) expand_h(multiply_const_vXX ss ii ff cc) |