diff options
author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
---|---|---|
committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gr-blocks/grc | |
parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) |
Merge branch 'maint'
Diffstat (limited to 'gr-blocks/grc')
-rw-r--r-- | gr-blocks/grc/blocks_block_tree.xml | 8 | ||||
-rw-r--r-- | gr-blocks/grc/blocks_ctrlport_performance.xml | 8 | ||||
-rw-r--r-- | gr-blocks/grc/blocks_ctrlport_probe2_c.xml | 10 | ||||
-rw-r--r-- | gr-blocks/grc/blocks_ctrlport_probe2_x.xml | 10 | ||||
-rw-r--r-- | gr-blocks/grc/blocks_ctrlport_probe_c.xml | 8 | ||||
-rw-r--r-- | gr-blocks/grc/blocks_ctrlport_viewer.xml | 8 | ||||
-rw-r--r-- | gr-blocks/grc/blocks_message_strobe.xml | 2 | ||||
-rw-r--r-- | gr-blocks/grc/blocks_message_strobe_random.xml | 4 | ||||
-rw-r--r-- | gr-blocks/grc/blocks_tags_strobe.xml | 2 |
9 files changed, 30 insertions, 30 deletions
diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 7001d906ac..b0d7ff0687 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -2,19 +2,19 @@ <!-- Copyright 2012,2013 Free Software Foundation, Inc. - + This file is part of GNU Radio - + GNU Radio is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. - + GNU Radio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GNU Radio; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/grc/blocks_ctrlport_performance.xml b/gr-blocks/grc/blocks_ctrlport_performance.xml index 00be541547..ae0fb91c50 100644 --- a/gr-blocks/grc/blocks_ctrlport_performance.xml +++ b/gr-blocks/grc/blocks_ctrlport_performance.xml @@ -2,19 +2,19 @@ <!-- Copyright 2012 Free Software Foundation, Inc. - + This file is part of GNU Radio - + GNU Radio is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. - + GNU Radio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GNU Radio; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/grc/blocks_ctrlport_probe2_c.xml b/gr-blocks/grc/blocks_ctrlport_probe2_c.xml index b5f0b089a7..708a8fdf9b 100644 --- a/gr-blocks/grc/blocks_ctrlport_probe2_c.xml +++ b/gr-blocks/grc/blocks_ctrlport_probe2_c.xml @@ -2,19 +2,19 @@ <!-- Copyright 2012-2013 Free Software Foundation, Inc. - + This file is part of GNU Radio - + GNU Radio is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. - + GNU Radio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GNU Radio; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, @@ -41,7 +41,7 @@ <value>Sample Points</value> <type>string</type> </param> - + <param> <name>Length</name> <key>len</key> diff --git a/gr-blocks/grc/blocks_ctrlport_probe2_x.xml b/gr-blocks/grc/blocks_ctrlport_probe2_x.xml index b9b1660bc9..47d1b81d3d 100644 --- a/gr-blocks/grc/blocks_ctrlport_probe2_x.xml +++ b/gr-blocks/grc/blocks_ctrlport_probe2_x.xml @@ -2,19 +2,19 @@ <!-- Copyright 2013 Free Software Foundation, Inc. - + This file is part of GNU Radio - + GNU Radio is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. - + GNU Radio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GNU Radio; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, @@ -72,7 +72,7 @@ <value>Sample Points</value> <type>string</type> </param> - + <param> <name>Length</name> <key>len</key> diff --git a/gr-blocks/grc/blocks_ctrlport_probe_c.xml b/gr-blocks/grc/blocks_ctrlport_probe_c.xml index 00a3f9cad7..64174204f1 100644 --- a/gr-blocks/grc/blocks_ctrlport_probe_c.xml +++ b/gr-blocks/grc/blocks_ctrlport_probe_c.xml @@ -2,19 +2,19 @@ <!-- Copyright 2012 Free Software Foundation, Inc. - + This file is part of GNU Radio - + GNU Radio is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. - + GNU Radio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GNU Radio; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/grc/blocks_ctrlport_viewer.xml b/gr-blocks/grc/blocks_ctrlport_viewer.xml index c8770d5dd9..2b69ae05ad 100644 --- a/gr-blocks/grc/blocks_ctrlport_viewer.xml +++ b/gr-blocks/grc/blocks_ctrlport_viewer.xml @@ -2,19 +2,19 @@ <!-- Copyright 2012 Free Software Foundation, Inc. - + This file is part of GNU Radio - + GNU Radio is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. - + GNU Radio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GNU Radio; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-blocks/grc/blocks_message_strobe.xml b/gr-blocks/grc/blocks_message_strobe.xml index 526a846477..4a6091d8e0 100644 --- a/gr-blocks/grc/blocks_message_strobe.xml +++ b/gr-blocks/grc/blocks_message_strobe.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- ################################################### -##Message Strobe +##Message Strobe ################################################### --> <block> diff --git a/gr-blocks/grc/blocks_message_strobe_random.xml b/gr-blocks/grc/blocks_message_strobe_random.xml index 71c51322c5..0b3e7296a0 100644 --- a/gr-blocks/grc/blocks_message_strobe_random.xml +++ b/gr-blocks/grc/blocks_message_strobe_random.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- ################################################### -##Message Strobe +##Message Strobe ################################################### --> <block> @@ -59,7 +59,7 @@ <type>message</type> <optional>1</optional> </source> - + <doc> Please note some peculiarities below: - poisson does not care about your std diff --git a/gr-blocks/grc/blocks_tags_strobe.xml b/gr-blocks/grc/blocks_tags_strobe.xml index f17edd2b99..ed14929329 100644 --- a/gr-blocks/grc/blocks_tags_strobe.xml +++ b/gr-blocks/grc/blocks_tags_strobe.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- ################################################### -## Tags Strobe +## Tags Strobe ################################################### --> <block> |