summaryrefslogtreecommitdiff
path: root/grc
diff options
context:
space:
mode:
authorTom Rondeau2012-03-13 12:00:38 -0400
committerTom Rondeau2012-03-13 12:00:38 -0400
commitc7328884281802be7fd973fe8150cabe72f81cf9 (patch)
tree966387668d01c920c1964a0d182f97b929527351 /grc
parent2d54dd698f1ec9574e54e6a31bc7356abdd3e4ec (diff)
parent0d6871b3aaa175ed20061543ded6d9f8b4dcbc61 (diff)
downloadgnuradio-c7328884281802be7fd973fe8150cabe72f81cf9.tar.gz
gnuradio-c7328884281802be7fd973fe8150cabe72f81cf9.tar.bz2
gnuradio-c7328884281802be7fd973fe8150cabe72f81cf9.zip
Merge branch 'master' into next
Conflicts: gnuradio-core/src/lib/general/Makefile.am gnuradio-core/src/lib/gengen/.gitignore gnuradio-core/src/lib/gengen/Makefile.am gnuradio-core/src/python/gnuradio/gr/Makefile.am
Diffstat (limited to 'grc')
-rw-r--r--grc/blocks/gr_noise_source_x.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/grc/blocks/gr_noise_source_x.xml b/grc/blocks/gr_noise_source_x.xml
index 4789b4400..72daaaa20 100644
--- a/grc/blocks/gr_noise_source_x.xml
+++ b/grc/blocks/gr_noise_source_x.xml
@@ -67,7 +67,7 @@
<param>
<name>Seed</name>
<key>seed</key>
- <value>42</value>
+ <value>0</value>
<type>int</type>
</param>
<source>