[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] git://gnuradio.org/jblum branch, volk_work, created. f
|
From: |
git version control |
|
Subject: |
[Commit-gnuradio] git://gnuradio.org/jblum branch, volk_work, created. ffb69bd5bb147e1a52c8c689e88cfaaec38babae |
|
Date: |
Mon, 16 Apr 2012 19:07:01 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/jblum".
The branch, volk_work has been created
at ffb69bd5bb147e1a52c8c689e88cfaaec38babae (commit)
- Log -----------------------------------------------------------------
commit ffb69bd5bb147e1a52c8c689e88cfaaec38babae
Author: Josh Blum <address@hidden>
Date: Mon Apr 16 12:10:46 2012 -0700
volk: build system work, can build stand-alone msvc
commit dcb97072fbc151de270f64fa0af4c9400261cbdf
Author: Josh Blum <address@hidden>
Date: Mon Apr 16 09:18:52 2012 -0700
volk: python checks and build system stuff
commit 26d5c10dae81b0fa764f0625be9af64216e9f4ce
Author: Josh Blum <address@hidden>
Date: Mon Apr 16 00:41:16 2012 -0700
volk: make orc a normal arch with overrule
commit d782c68e21f783c41031a7684dde646cba1ff382
Author: Josh Blum <address@hidden>
Date: Mon Apr 16 00:29:26 2012 -0700
volk: added compile utils and cleanup cmakelists
commit a38f8fbca0f85abea3c946955b9cc20faf5e033f
Author: Josh Blum <address@hidden>
Date: Sun Apr 15 19:11:52 2012 -0700
volk: working build w/ cmakelists
commit ca8ce967c81bb60440575cbc457fb330bcb4d7f8
Author: Josh Blum <address@hidden>
Date: Sun Apr 15 17:32:38 2012 -0700
volk: created other templates for runtime + machines
commit 3ede4aca8e14b582056b32ea5e5111f04a8831b2
Author: Josh Blum <address@hidden>
Date: Sun Apr 15 15:38:14 2012 -0700
volk: added kernel defs and typedefs
commit d2e6c036426116df13934883224283b3f1ec7d40
Author: Josh Blum <address@hidden>
Date: Sun Apr 15 13:56:10 2012 -0700
volk: work on template stuff
commit f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2
Author: Tom Rondeau <address@hidden>
Date: Fri Apr 13 18:36:53 2012 -0400
Removed whitespace and added dtools/bin/remove-whitespace as a tool to do
this in the future.
The sed script was provided by Moritz Fischer.
commit 6a1e9783fec6ed827f49db27c171591d30f32933
Author: Tom Rondeau <address@hidden>
Date: Fri Apr 13 09:48:18 2012 -0400
digital: updated BER test recever to use new SNR probe in digital.
commit 0dec80cb29da6dc4fbf4c349ea5c3399521561da
Author: Tom Rondeau <address@hidden>
Date: Fri Apr 13 09:47:55 2012 -0400
Fix some minor warnings.
commit f0c9a22db5442ff6029a0561bb2178de851c6b77
Author: Nick Foster <address@hidden>
Date: Thu Apr 12 11:24:54 2012 -0400
filters: add alias of "BLACKMAN_HARRiS" to "BLACKMAN_hARRIS" for
consistency.
commit 779d8c67ae520ab76198019e656c86c88281719d
Merge: 3de14a2 c7139a7
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 9 14:10:26 2012 -0700
Merge branch 'maint'
commit 3de14a2aee748c80a5f1e61e3ca6809fc2e914bc
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 9 12:33:42 2012 -0700
updated ignores, building with Python < 2.7 can leave stray files
commit 49e6c5dbfdde7188183e1f7373447d0b2124b046
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 9 12:12:14 2012 -0700
cmake: update revision to 3.6.0git
commit 79cf7ef66d7baf76a3f319c263919b0048441530
Author: Michael Dickens <address@hidden>
Date: Mon Apr 9 08:50:42 2012 -0700
wavelet: fix swig paths for OSX
commit d8531850cab78d763f6dc9cd0c2eb83c5bc6f5b2
Merge: 9bef26c 25b2949
Author: Johnathan Corgan <address@hidden>
Date: Sat Apr 7 23:08:14 2012 -0700
Merge remote branch 'jblum/wip_grc_any_blocks'
commit 9bef26c9271a7b9253075bda3c1fc7c8078c0343
Merge: f621a52 ef72dc7
Author: Johnathan Corgan <address@hidden>
Date: Sat Apr 7 19:32:10 2012 -0700
Merge branch 'next'
commit ef72dc714840dfb8fe3f918dda243f74453b6cc7
Merge: ef9d7de f621a52
Author: Johnathan Corgan <address@hidden>
Date: Sat Apr 7 18:50:26 2012 -0700
Merge branch 'master' into next
* Used merge strategy 'ours' to skip release commit
commit ef9d7dee4fb30f1961bcbfb1142b498b749ebd9a
Merge: b2f8b42 7097d4b
Author: Tom Rondeau <address@hidden>
Date: Sat Apr 7 20:05:10 2012 -0400
Merge branch 'master' into next
Conflicts:
gr-howto-write-a-block/Makefile.common
gr-howto-write-a-block/config/gr_standalone.m4
commit b2f8b4269558cdca3741ad9f3b6a9ee9114b1a8a
Merge: c5a1674 2ebcbd4
Author: Johnathan Corgan <address@hidden>
Date: Sat Apr 7 13:58:22 2012 -0700
Merge branch 'master' into next
commit c5a167406dd7333c130935fa176d8fb503bb8b45
Merge: 81d6389 278cf19
Author: Tom Rondeau <address@hidden>
Date: Sat Apr 7 16:35:06 2012 -0400
Merge branch 'master' into next
commit 81d6389cf749fe5ee13567262f0d547c017fd341
Merge: 56a3780 258d612
Author: Tom Rondeau <address@hidden>
Date: Sat Apr 7 14:42:28 2012 -0400
Merge branch 'master' into next
commit 56a3780d97dee6c461eaaaadb462c97c46610d81
Merge: c6ae4c2 faf1d33
Author: Tom Rondeau <address@hidden>
Date: Fri Apr 6 13:41:42 2012 -0400
Merge branch 'master' into next
commit c6ae4c28efac7ed8603b0ae5db4709205af6123d
Merge: 5b11e7e 99ebcc1
Author: Johnathan Corgan <address@hidden>
Date: Thu Apr 5 11:53:24 2012 -0700
Merge branch 'master' into next
commit 5b11e7e7f69ef1ebe34c24c6a97da0450ab2e419
Author: Tom Rondeau <address@hidden>
Date: Thu Apr 5 13:10:01 2012 -0400
core: removing old MPSK SNR probe; replaced in gr-digital.
commit ff30305872ee1a0c72db871260fb700c300fd349
Merge: 8f84dfd c662d1c
Author: Tom Rondeau <address@hidden>
Date: Thu Apr 5 12:14:57 2012 -0400
Merge branch 'master' into next
Conflicts:
gr-digital/grc/Makefile.am
commit 8f84dfdd2104ec70057c31b70494bfac95b47424
Merge: 2f73fe2 a66a650
Author: Tom Rondeau <address@hidden>
Date: Thu Apr 5 10:39:55 2012 -0400
Merge branch 'master' into next
Conflicts:
grc/blocks/Makefile.am
commit 2f73fe22c5e1591242a9556221ec8487170a7b00
Merge: 29c887d 7119539
Author: Johnathan Corgan <address@hidden>
Date: Wed Apr 4 18:22:02 2012 -0700
Merge remote branch 'tom/cmake_builds' into next
commit 29c887da604206aa6f3ad1859f70958231a7a1cb
Merge: c787fb6 b711a86
Author: Johnathan Corgan <address@hidden>
Date: Wed Apr 4 17:08:42 2012 -0700
Merge branch 'master' into next
commit c787fb66bf3512b5cd4870ef74cd1e4d91802820
Merge: 512f64f f88b8cf
Author: Johnathan Corgan <address@hidden>
Date: Wed Apr 4 16:03:10 2012 -0700
Merge branch 'master' into next
commit 512f64f7bc123fe3a6f2ae6cd788a0529b9fd8cf
Author: Johnathan Corgan <address@hidden>
Date: Wed Apr 4 12:00:34 2012 -0700
wavelet: simplified swig generation after virtual interface class change
commit 531ffdf2c8d0baebb553d8db323edb0ab67e9099
Merge: 6522dd0 a87ac60
Author: Johnathan Corgan <address@hidden>
Date: Wed Apr 4 11:47:39 2012 -0700
Merge branch 'master' into next
Conflicts:
config/grc_gr_fcd.m4
gr-fcd/swig/Makefile.am
gr-fcd/swig/fcd_swig.i
commit 6522dd051302a1691a7ce27be78acd81d733fdb2
Merge: fb82922 fc03a9b
Author: Johnathan Corgan <address@hidden>
Date: Tue Apr 3 18:18:41 2012 -0700
Merge branch 'master' into next
commit 71195397a2624cbc0cd144418fe958f436657be5
Author: Tom Rondeau <address@hidden>
Date: Tue Apr 3 19:36:12 2012 -0400
cmake: fixing current build version number.
commit faab807cf5e8b4a4c950d1fd8ae6672296fb1ad9
Author: Tom Rondeau <address@hidden>
Date: Tue Apr 3 18:21:52 2012 -0400
Rework example directories. Gets rid of gnuradio-examples, moves these to
more appropriate components.
gnuradio-core and grc now have their own examples directories for files
directly related to them.
commit 7c6361c85a00517b9781d4cd4f2c2e3bdda67035
Merge: 0c1b35d 7dc08ba
Author: Tom Rondeau <address@hidden>
Date: Tue Apr 3 17:52:55 2012 -0400
Merge branch 'rm_python_ext' into cmake_builds
Conflicts:
CMakeLists.txt
commit 0c1b35d17e9aa5058f58fd8763bb292613b3658a
Merge: e2b1a98 f2ed379
Author: Tom Rondeau <address@hidden>
Date: Tue Apr 3 17:51:53 2012 -0400
Merge branch 'cmake_version' into cmake_builds
commit e2b1a980dc51c9ae2102d0756818db1215b1ef10
Author: Tom Rondeau <address@hidden>
Date: Tue Apr 3 13:13:09 2012 -0400
build: Adding gnuradio-examples as a component to be turned on/off.
commit 50acbac3f7cae00f8cfeab44efd7cdc4d41d5018
Author: Tom Rondeau <address@hidden>
Date: Tue Apr 3 13:12:50 2012 -0400
docs: adding more info to the doxygen manual's build guide.
commit 7dc08ba2875c0dace0432cd514add6ce2b085f44
Author: Tom Rondeau <address@hidden>
Date: Tue Apr 3 11:35:35 2012 -0400
examples: Reworked locations and installation of examples.
All python and GRC examples directly associated with a top-level component
are now in that examples directory. Examples are split into c++, python, and
grc dirs but are all installed into $prefix/share/gnuradio/examples/<component>.
commit 0dd3e32b5526c085a983d7ff235bac61ec2c52ff
Author: Tom Rondeau <address@hidden>
Date: Mon Apr 2 22:59:33 2012 -0400
noaa: py files build from grc. Only installing grc files into examples.
commit 350726ae56d46d2c7c1adf71b7049369a428d455
Author: Tom Rondeau <address@hidden>
Date: Mon Apr 2 22:51:55 2012 -0400
noaa: moving apps to examples.
commit 54b761bfced5574377c1e1a0295fbe3720c104b8
Author: Tom Rondeau <address@hidden>
Date: Mon Apr 2 22:50:15 2012 -0400
build: don't install Python and GRC examples if Python is disabled.
commit b7090a711a9c99dee18115d73af742594121331d
Author: Tom Rondeau <address@hidden>
Date: Mon Apr 2 21:24:50 2012 -0400
Move uhd_siggen_base python file into gnuradio.uhd space.
commit f964938f315cade73e88993623015ec4ee34c050
Author: Tom Rondeau <address@hidden>
Date: Mon Apr 2 19:54:32 2012 -0400
fixes to uhd_siggen with base class.
commit 689699fb8a26486fedb2838b8a3b468372364903
Author: Tom Rondeau <address@hidden>
Date: Mon Apr 2 19:19:03 2012 -0400
build: removed .py extensions from uhd and shd installed Python programs.
commit fb8292238c7efff4a5b2a7ae26d3a2835f9be3ce
Merge: bbb8650 27608bf
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 2 16:08:57 2012 -0700
Merge branch 'master' into next
Conflicts:
gr-uhd/swig/uhd_swig.i
commit bbb8650eb525a58be2a427daa38ff6c464c5b882
Merge: 5805e76 2bf6445
Author: Johnathan Corgan <address@hidden>
Date: Sun Apr 1 17:32:07 2012 -0700
Merge remote branch 'tom/cmake_builds' into next
commit 5805e7647d14a64bb86d0e83898ebda764f57c31
Merge: de0070d f2ed379
Author: Johnathan Corgan <address@hidden>
Date: Sun Apr 1 17:30:25 2012 -0700
Merge remote branch 'tom/cmake_version' into next
* Changed version to make it build 3.6git, not 3.6.0.0
commit de0070d765ea31befcbc14eaecae2b934eec4afb
Merge: 269691c 98c703b
Author: Johnathan Corgan <address@hidden>
Date: Sun Apr 1 16:47:32 2012 -0700
Merge branch 'master' into next
commit 269691c7d45675382bafbdf8a56f0682f1927fd9
Author: Johnathan Corgan <address@hidden>
Date: Sun Apr 1 16:18:40 2012 -0700
wavelet: converted blocks to private implementation pattern
commit 1ca78cb621cbd60f25c5ce4373fa727114a86cee
Author: Tom Rondeau <address@hidden>
Date: Sun Apr 1 17:16:41 2012 -0400
build: removed .py extensions from installed Python plot programs.
The fft and psd bases have been moved into the Python packages directory
and new wrappers for data-type independent programs have been created.
commit f9b73b1710f19529b99f8f69c8e3a06839ad68bc
Author: Johnathan Corgan <address@hidden>
Date: Sun Apr 1 13:23:06 2012 -0700
wavelet: move wavelet blocks to new top-level component
commit 2bf64459036916258dcf3269cec47904fdeba8f6
Author: Tom Rondeau <address@hidden>
Date: Sun Apr 1 16:13:42 2012 -0400
Removes all references to guile and scheme, which are no longer needed.
The remaining pmt_serial_tags.scm is parsed by Python already. Future
modifications could change this format to not confuse the point.
commit a40ac1d61259dda14e5a6abf328004d3f4b17f02
Merge: bd7b4a5 86321b2
Author: Johnathan Corgan <address@hidden>
Date: Sun Apr 1 11:00:07 2012 -0700
Merge branch 'master' into next
Conflicts:
gr-fcd/lib/Makefile.am
commit 6d20c58eba20406c3a1d6131e28a5bad8d18a408
Author: Tom Rondeau <address@hidden>
Date: Sun Apr 1 12:18:54 2012 -0400
docs: updating README files for working with cmake.
commit f2ed379e1fe27096bdfc62ae715d870bcde9a5d1
Author: Tom Rondeau <address@hidden>
Date: Sun Apr 1 11:19:28 2012 -0400
cmake: remove version.sh since we don't need it for autotools. Set version
info in CMakeLists.txt.
commit bd7b4a566da02a3e68857c7f5a6963a132a2f2d2
Merge: 16d63a5 1aecf53
Author: Tom Rondeau <address@hidden>
Date: Tue Mar 27 23:30:52 2012 -0400
Merge branch 'master' into next
commit 16d63a572c8022766063d2d601e9a635f92871ce
Merge: e91ae54 79e341d
Author: Johnathan Corgan <address@hidden>
Date: Tue Mar 27 14:28:48 2012 -0700
Merge branch 'master' into next
commit 25b29495b71e8d3276a9a2f27044524c833772cb
Author: Josh Blum <address@hidden>
Date: Sun Mar 25 17:52:42 2012 -0700
grc: resolve down and up stream for empty types
commit e91ae54188e9812f3d8ed45e7f675e5a98ec889f
Merge: 7eebbcd 87c8751
Author: Johnathan Corgan <address@hidden>
Date: Sat Mar 24 10:19:49 2012 -0700
Merge branch 'master' into next
Conflicts:
gr-uhd/lib/Makefile.am
commit 7eebbcd5ed9f94904adf99967c928ec736779a4a
Merge: 4877256 ad6cdc5
Author: Johnathan Corgan <address@hidden>
Date: Fri Mar 23 17:38:08 2012 -0700
Merge branch 'master' into next
commit 4877256972c32ddbb1b92e0ac95f71ad7607dd46
Merge: 2e5519b 47315e9
Author: Johnathan Corgan <address@hidden>
Date: Fri Mar 23 12:07:23 2012 -0700
Merge branch 'master' into next
commit 2e5519b642217fc83324360596ea834cff414ce3
Merge: a214995 fc115e6
Author: Johnathan Corgan <address@hidden>
Date: Thu Mar 22 15:24:38 2012 -0700
Merge branch 'master' into next
Conflicts:
config/Makefile.am
configure.ac
commit a21499503e97189644b882ec12210ed4fa501414
Merge: b62700a 69c9100
Author: Johnathan Corgan <address@hidden>
Date: Thu Mar 22 15:07:04 2012 -0700
Merge branch 'master' into next
commit b62700ab8fad6343378b816a2e4f88170bf7d8dd
Merge: abc7967 314916c
Author: Tom Rondeau <address@hidden>
Date: Tue Mar 20 19:57:18 2012 -0400
Merge branch 'master' into next
commit abc796707426337f408166b44251c6ca1bc5d20f
Merge: b05ac49 77834b2
Author: Tom Rondeau <address@hidden>
Date: Mon Mar 19 13:56:21 2012 -0400
Merge branch 'master' into next
Conflicts:
volk/config/orc.m4
commit b05ac49ced6a9b4cd4e4ba2d0a3ed74b6979dcc8
Merge: 70c625e bbddd08
Author: Tom Rondeau <address@hidden>
Date: Sun Mar 18 20:05:21 2012 -0400
Merge branch 'master' into next
commit 70c625e9cec45bb8d2c31a0d3db0068c529f39fb
Merge: 2273c29 c138b94
Author: Johnathan Corgan <address@hidden>
Date: Sun Mar 18 13:31:15 2012 -0700
Merge branch 'master' into next
commit 2273c29ef83f420b69c233e8c59a190786965256
Merge: 710f3dc 3e4924f
Author: Johnathan Corgan <address@hidden>
Date: Sat Mar 17 11:26:26 2012 -0700
Merge branch 'master' into next
Conflicts:
config/grc_gruel.m4
commit 710f3dccddcd1096e3b14899d589b96da39c1dd8
Merge: fcdac04 7e2d501
Author: Johnathan Corgan <address@hidden>
Date: Fri Mar 16 14:43:18 2012 -0700
Merge branch 'master' into next
commit fcdac045ad64099949dbbefff25832a6dcef3187
Merge: b5dbeb3 74f7c07
Author: Tom Rondeau <address@hidden>
Date: Fri Mar 16 16:57:38 2012 -0400
Merge branch 'master' into next
Conflicts:
gruel/src/swig/Makefile.am
commit b5dbeb3f02b7e230f0e8fd49640047a04c6908b6
Merge: 8b63090 b42436c
Author: Tom Rondeau <address@hidden>
Date: Fri Mar 16 14:17:02 2012 -0400
Merge branch 'master' into next
commit 8b63090ba35fb29f583f0c06d31804951b5f643e
Merge: ac9cd0e c095de4
Author: Johnathan Corgan <address@hidden>
Date: Thu Mar 15 16:48:03 2012 -0700
Merge branch 'master' into next
commit ac9cd0eba188e25d724878f3071a30ae6da47e48
Merge: c4c985b 29ac4f1
Author: Tom Rondeau <address@hidden>
Date: Thu Mar 15 18:03:49 2012 -0400
Merge branch 'master' into next
commit c4c985b2aed889bc49a4e30b1e8866bb214b03a2
Merge: 2de96be 263bdb4
Author: Johnathan Corgan <address@hidden>
Date: Thu Mar 15 15:00:04 2012 -0700
Merge branch 'master' into next
commit 2de96be2ce56dc258714fcb2ef87e8cda03f72f7
Merge: 6085928 4310205
Author: Johnathan Corgan <address@hidden>
Date: Thu Mar 15 08:49:23 2012 -0700
Merge branch 'master' into next
commit 608592851b23fd05b50aa128d12624877c08518e
Merge: c732888 295a0da
Author: Tom Rondeau <address@hidden>
Date: Tue Mar 13 18:33:04 2012 -0400
Merge branch 'master' into next
commit c7328884281802be7fd973fe8150cabe72f81cf9
Merge: 2d54dd6 0d6871b
Author: Tom Rondeau <address@hidden>
Date: Tue Mar 13 12:00:38 2012 -0400
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
commit 2d54dd698f1ec9574e54e6a31bc7356abdd3e4ec
Merge: bbfe6d6 7a3a0b5
Author: Johnathan Corgan <address@hidden>
Date: Mon Mar 12 09:58:01 2012 -0700
Merge branch 'master' into next
commit bbfe6d614e38ceb0fe8efbe8a5927d92ca9c72b1
Merge: 3fec740 502d746
Author: Tom Rondeau <address@hidden>
Date: Sat Mar 10 07:58:17 2012 -0500
Merge branch 'master' into next
commit 3fec74030bd0de7b182d982193fd93252dbb52dc
Merge: 5c86c07 aabc6bd
Author: Johnathan Corgan <address@hidden>
Date: Thu Mar 8 16:49:08 2012 -0800
Merge branch 'master' into next
commit 5c86c074b437f619754d90af0722ee03754e0aa9
Merge: 22d1f5c 57ad294
Author: Johnathan Corgan <address@hidden>
Date: Mon Mar 5 11:53:25 2012 -0800
Merge branch 'master' into next
Use merge strategy '-s ours' to skip release commits.
commit 22d1f5c3db78db84237041346cc4e72382fa658f
Merge: e0f885c 1864683
Author: Johnathan Corgan <address@hidden>
Date: Mon Mar 5 11:53:14 2012 -0800
Merge remote branch 'gnuradio/master' into next
commit e0f885c8325f164334030429ae731e613de9add2
Merge: c53529f 4f0add1
Author: Tom Rondeau <address@hidden>
Date: Sat Mar 3 10:27:15 2012 -0500
Merge branch 'master' into next
commit c53529ff00012646f4aa47e820bddd48995ab094
Author: Tom Rondeau <address@hidden>
Date: Sat Mar 3 10:11:28 2012 -0500
volk: include config.h to have rintf in windows/msvc.
commit b0f3db9a0785d69d004d65054bb70a4dd70dcb65
Author: Tom Rondeau <address@hidden>
Date: Fri Mar 2 16:21:30 2012 -0500
grc: updating to new name of pfb synthesizer block.
commit d1f1c53fbc8ac7b8146af51cb104acb07cb7bdb2
Author: Tom Rondeau <address@hidden>
Date: Fri Mar 2 16:15:31 2012 -0500
examples: fixing synthesizer examples to use new block name.
commit 749b27b25818a292f6484c25501fad0faf748f6c
Author: Tom Rondeau <address@hidden>
Date: Fri Mar 2 16:10:53 2012 -0500
core: changed name of gr_pfb_synthesis_filterbank_ccf to gr_pfb_synthesizer
to make it easier to write and remember.
commit 875f5185a7feecbb1d4a3426a443bd873b0abd4b
Merge: bc5494f 0a6f149
Author: Johnathan Corgan <address@hidden>
Date: Thu Mar 1 17:02:07 2012 -0800
Merge branch 'master' into next
Conflicts:
config/grc_volk.m4
gnuradio-core/src/guile/tests/gengen_ctors.test
gnuradio-core/src/lib/Makefile.am
gnuradio-core/src/lib/general/.gitignore
gnuradio-core/src/lib/general/Makefile.am
gnuradio-core/src/lib/gengen/.gitignore
gnuradio-core/src/python/gnuradio/gr/Makefile.am
volk/include/volk/Makefile.am
commit bc5494fc83721b22b5c6a94e1300e112d6269313
Merge: 0f73b09 088ca3e
Author: Tom Rondeau <address@hidden>
Date: Thu Mar 1 11:28:04 2012 -0500
Merge branch 'master' into next
commit 0f73b0991f4da55b118b4029e2e53fde64580caa
Author: Tom Rondeau <address@hidden>
Date: Wed Feb 29 20:42:17 2012 -0500
grc: grc PFB channelizer and synthesize to set channel map defaults on
startup.
commit ed72fd930b6c7c23273c928d02b54587c0cac9a3
Merge: 030cfac 4c509e6
Author: Johnathan Corgan <address@hidden>
Date: Wed Feb 29 11:51:19 2012 -0800
Merge branch 'master' into next
commit 030cfac62db69b8eb19ae5a79ae6ec71d113b47b
Merge: 06b9d21 91bbef4
Author: Tom Rondeau <address@hidden>
Date: Tue Feb 28 23:56:28 2012 -0500
Merge branch 'synth' into next
commit 06b9d21dac84b97b8da1a72547bf936f30fe8340
Merge: de9ac76 d71f510
Author: Tom Rondeau <address@hidden>
Date: Tue Feb 28 23:56:01 2012 -0500
Merge branch 'next' of gnuradio.org:gnuradio into next
commit 91bbef469b054dfd56c03d9fc027972ec102a4a9
Author: Tom Rondeau <address@hidden>
Date: Tue Feb 28 23:55:38 2012 -0500
grc: adding new inputs to channelizer and synthesizer xml.
commit d71f5104ab3f4f8ec7292c3358670e6b8ce10fa7
Merge: 2dfcc2d 0750b35
Author: Johnathan Corgan <address@hidden>
Date: Tue Feb 28 19:09:01 2012 -0800
Merge branch 'master' into next
commit 68a36d3e2c78d477e9c793df9ec9f540aa5f327d
Author: Tom Rondeau <address@hidden>
Date: Tue Feb 28 16:24:43 2012 -0500
core: simple formatting.
commit 47d6864ea92cf10899d7beebf2cb15eb08c140f2
Author: Tom Rondeau <address@hidden>
Date: Tue Feb 28 16:23:52 2012 -0500
examples: adding an example of using the channelizer and synthesize
together to reconstruct a signal.
commit 3d3d3c05291aebb1ad90d22f9674546347cb96d6
Author: Tom Rondeau <address@hidden>
Date: Tue Feb 28 16:02:16 2012 -0500
core: pfb channelizer: can now set a channel map to direct the channels to
a specific output stream.
Now, not all output channels must be connected; can connect M of N channels
(M <= N) and use the channel_map to set which channel from the original
wideband signal go to which output streams.
commit d15bed21e08f97b0ac510b49124c9231289820c2
Author: Tom Rondeau <address@hidden>
Date: Tue Feb 28 12:36:00 2012 -0500
core: pfb synth: can now set channel map and to use 1 or 2 sps on output.
The channel map allows the user to set the streams anywhere in the channel
output.
commit dd4cc588d7a34f82a63c6b23ca7a1fab736bfc10
Author: Tom Rondeau <address@hidden>
Date: Mon Feb 20 10:12:57 2012 -0500
core: wip on pfb synthesis. It works, but is a bit hacked together.
Need to determine the best way to handle the two filter cases, with and
without oversampling.
commit de9ac7602116aab499b7f05a17de7f8d17e9657a
Merge: 356bc1a 2dfcc2d
Author: Tom Rondeau <address@hidden>
Date: Mon Feb 27 16:16:26 2012 -0500
Merge branch 'next' of gnuradio.org:gnuradio into next
commit 2dfcc2dc875ae82c45ab32cd34d170dc20424fc7
Merge: 739ac87 e0dec91
Author: Johnathan Corgan <address@hidden>
Date: Mon Feb 27 13:06:27 2012 -0800
Merge branch 'master' into next
commit 356bc1a466d9c0f8977dc424a3eea3574c91e1c3
Merge: 739ac87 f2d8381
Author: Tom Rondeau <address@hidden>
Date: Mon Feb 27 16:02:53 2012 -0500
Merge branch 'master' into next
commit 739ac87e34242b0fbcccb4a8b10d3eb16ec2723d
Merge: 399bf08 cff2b9c
Author: Tom Rondeau <address@hidden>
Date: Mon Feb 27 13:05:09 2012 -0500
Merge branch 'master' into next
commit 399bf08bf0b61f599001c990d3c0cfd24cc368f6
Merge: 49bba63 314bc60
Author: Johnathan Corgan <address@hidden>
Date: Sun Feb 26 15:43:24 2012 -0800
Merge branch 'master' into next
commit 49bba6365830b1ec66caa28c67be49d2ab091d9e
Merge: e5bf23d ee91264
Author: Tom Rondeau <address@hidden>
Date: Fri Feb 24 15:59:20 2012 -0500
Merge branch 'master' into next
Conflicts:
gr-digital/grc/Makefile.am
commit e5bf23ddd93ba33fe92a835b24482fd4cf9ec3aa
Merge: 059e79a dc963e9
Author: Tom Rondeau <address@hidden>
Date: Thu Feb 23 13:55:24 2012 -0500
Merge branch 'master' into next
commit 059e79a6c66fa8fae4fc92ca7283c7a07989232f
Merge: 5977d90 7298614
Author: Tom Rondeau <address@hidden>
Date: Tue Feb 21 22:53:20 2012 -0500
Merge branch 'master' into next
commit 5977d9006bd7c81a35e347f946e5e7983145ff0c
Author: Marcus Leech <address@hidden>
Date: Mon Feb 20 17:34:01 2012 -0500
uhd: updated uhd programs to use stream_args concept from command line for
more than just setting the scalar.
commit 991c8f4bb0c897decb0a62d15b3e44316a46cf95
Merge: 8a4a83a e4693df
Author: Tom Rondeau <address@hidden>
Date: Mon Feb 20 10:17:59 2012 -0500
Merge branch 'master' into next
commit 8a4a83a768d205a28b8deced03a0ed4289e6f60f
Merge: 748e3e8 34508cd
Author: Johnathan Corgan <address@hidden>
Date: Fri Feb 17 13:51:00 2012 -0800
Merge branch 'master' into next
Conflicts:
gr-vocoder/grc/Makefile.am
grc/blocks/Makefile.am
commit 748e3e84fe921cf03adbd9f411105af6202df763
Merge: b0f11a1 fed443d
Author: Tom Rondeau <address@hidden>
Date: Fri Feb 17 15:41:06 2012 -0500
Merge branch 'master' into next
commit b0f11a1d6f2d25528c820cab2bc2065e4f258854
Merge: 9eec189 3b3b7e3
Author: Tom Rondeau <address@hidden>
Date: Fri Feb 17 10:30:19 2012 -0500
Merge branch 'next' of gnuradio.org:gnuradio into next
commit 9eec189978d7e3a5b67da21191b391e464561816
Author: Tom Rondeau <address@hidden>
Date: Fri Feb 17 10:28:46 2012 -0500
howto: moving uninstall rules into correct location.
commit 3b3b7e31814ff0af2a017263d16f9af6bf8a3f18
Merge: c051c0f 2fc3ae3
Author: Johnathan Corgan <address@hidden>
Date: Thu Feb 16 10:13:49 2012 -0800
Merge branch 'master' into next
commit c051c0f0ca8def9a58377f167eb11b78c5e9cd12
Merge: 37021a4 d545481
Author: Tom Rondeau <address@hidden>
Date: Wed Feb 15 22:45:08 2012 -0500
Merge branch 'master' into next
commit 37021a4c1393026de88725565ba23ebd6d0cc4d9
Merge: 3222590 dc266ca
Author: Johnathan Corgan <address@hidden>
Date: Tue Feb 14 11:23:42 2012 -0800
Merge branch 'master' into next
commit 32225905cb4fef7364668fffc16c808ac6c3bee8
Merge: 665f4e0 1c41758
Author: Tom Rondeau <address@hidden>
Date: Tue Feb 14 09:35:17 2012 -0500
Merge branch 'master' into next
commit 665f4e0ecbdae17cbb0ee84a1a5b7ee37594c544
Merge: 5c36c2d 6410e39
Author: Tom Rondeau <address@hidden>
Date: Fri Feb 10 11:16:13 2012 -0500
Merge branch 'master' into next
commit 5c36c2dd5aa47acfb678595ad69792affd13bfbf
Merge: 41107df 39f86af
Author: Tom Rondeau <address@hidden>
Date: Fri Feb 10 11:14:28 2012 -0500
Merge branch 'master' into next
commit 41107dfc64e460d2a71536a1f16d69bb68e1960d
Merge: 83c5a8a c2c8a53
Author: Tom Rondeau <address@hidden>
Date: Wed Feb 8 19:49:42 2012 -0500
Merge branch 'master' into next
commit 83c5a8a66d619423beec55f689640a89e2bd762b
Merge: 10ece2b f12f7ba
Author: Tom Rondeau <address@hidden>
Date: Tue Feb 7 13:18:47 2012 -0500
Merge branch 'master' into next
commit 10ece2bbb3d2ba34ea18dadfb06ce6e6fd1ae6c3
Merge: b5eebec 35b689e
Author: Tom Rondeau <address@hidden>
Date: Mon Feb 6 22:23:45 2012 -0500
Merge branch 'master' into next
commit b5eebec60f4802e2be0e0ef51084f4f008ef60d7
Merge: f216463 110cb25
Author: Johnathan Corgan <address@hidden>
Date: Mon Feb 6 17:07:23 2012 -0800
Merge branch 'master' into next
commit f2164639dffd6d43c07206342fa775c780c77646
Merge: 47b79cb b4be410
Author: Johnathan Corgan <address@hidden>
Date: Mon Feb 6 14:59:01 2012 -0800
Merge branch 'master' into next
commit 47b79cb6ed9544df04efe3f5e84003b6d8234024
Merge: 17bb7b9 895bb2f
Author: Tom Rondeau <address@hidden>
Date: Mon Feb 6 17:33:50 2012 -0500
Merge branch 'master' into next
commit 17bb7b9dd517d5191f89ccf04fe906d2457b5c1b
Merge: 9bbedbb 50faa5c
Author: Johnathan Corgan <address@hidden>
Date: Mon Feb 6 13:45:44 2012 -0800
Merge branch 'master' into next
commit 9bbedbbd950427b39215f880725e0a47b4b0a310
Merge: c4d0b47 1b8958f
Author: Tom Rondeau <address@hidden>
Date: Mon Feb 6 14:55:50 2012 -0500
Merge branch 'master' into next
commit c4d0b47fdbbbfee18d6dfc87c501731a0591fa57
Merge: f49facf 7e10a26
Author: Tom Rondeau <address@hidden>
Date: Mon Feb 6 14:48:13 2012 -0500
Merge branch 'master' into next
commit f49facf71cd1b31a8553de85377d956a3299f2d7
Merge: 89e32f4 ed7db7d
Author: Johnathan Corgan <address@hidden>
Date: Mon Feb 6 11:13:09 2012 -0800
Merge branch 'master' into next
commit 89e32f4031d68b5f2a819f1923808958f931edb7
Merge: 6063ef0 1023c48
Author: Johnathan Corgan <address@hidden>
Date: Sun Feb 5 10:44:40 2012 -0800
Merge branch 'master' into next
commit 6063ef0108a5382427519e4b99555ac7a0eee730
Merge: 3bc34ff ae4770a
Author: Johnathan Corgan <address@hidden>
Date: Fri Feb 3 14:25:03 2012 -0800
Merge branch 'master' into next
commit 3bc34ff378d08e623b020d84c495cbc000ffab97
Merge: 0371e7b 309ca76
Author: Johnathan Corgan <address@hidden>
Date: Thu Feb 2 13:34:40 2012 -0800
Merge branch 'master' into next
commit 0371e7b427008f6f5fc39cc98a39a73e68362b8a
Merge: 89d8421 00518ca
Author: Tom Rondeau <address@hidden>
Date: Wed Feb 1 17:21:36 2012 -0500
Merge branch 'master' into next
commit 89d8421f00af503cd5805bc240f044a1d4431315
Merge: f87aef6 29aa72d
Author: Johnathan Corgan <address@hidden>
Date: Fri Jan 27 14:01:21 2012 -0800
Merge branch 'master' into next
commit f87aef68a654d665ff1a773647dc1d5c9c5c9786
Merge: 242626e 8ddd8fb
Author: Johnathan Corgan <address@hidden>
Date: Wed Jan 25 16:36:11 2012 -0800
Merge branch 'master' into next
commit 242626ea07d3c81d03a1e6e01c5995a03d0566ee
Merge: 976350d 3901b0b
Author: Tom Rondeau <address@hidden>
Date: Sat Jan 21 10:43:54 2012 -0500
Merge branch 'master' into next
commit 976350d892b04f5d7cc4bf939f9cbf502206a476
Merge: 2899096 d2ff8e3
Author: Tom Rondeau <address@hidden>
Date: Thu Jan 19 22:22:49 2012 -0500
Merge branch 'master' into next
commit 28990966c67d640c857957c471fad916f0d8a829
Merge: 893790b fe88a1d
Author: Tom Rondeau <address@hidden>
Date: Wed Jan 18 20:01:39 2012 -0500
Merge branch 'master' into next
commit 893790b32204842085c4ccc561348ec2a09b7d78
Merge: 2683a0c 6b74855
Author: Johnathan Corgan <address@hidden>
Date: Wed Jan 18 08:58:30 2012 -0800
Merge branch 'master' into next
Conflicts:
gr-noaa/Makefile.am
commit 2683a0c0f240c2e42af2fae7cb91643b3f455111
Merge: 61b4f5e b6a00c8
Author: Johnathan Corgan <address@hidden>
Date: Tue Jan 17 16:28:07 2012 -0800
Merge branch 'master' into next
commit 61b4f5e1a1141cee6c5ccb16d648f1d195f73c77
Merge: bd56b0d 4beff39
Author: Tom Rondeau <address@hidden>
Date: Mon Jan 16 10:11:51 2012 -0500
Merge branch 'master' into next
commit bd56b0d7d5ab684f2a22279164832756ec8e459e
Merge: 564b266 5c4da90
Author: Tom Rondeau <address@hidden>
Date: Mon Jan 16 00:17:08 2012 -0500
Merge branch 'master' into next
Conflicts:
grc/blocks/Makefile.am
commit 564b266eb1014b09f0e658686ca3dc7b8c5dae0d
Merge: 72d1ff0 53407a4
Author: Tom Rondeau <address@hidden>
Date: Sun Jan 15 18:37:32 2012 -0500
Merge branch 'master' into next
commit 72d1ff01ca68f798befc3d58b61bd30c76e42c4a
Merge: cdda4a5 cc0949b
Author: Johnathan Corgan <address@hidden>
Date: Fri Jan 13 08:07:43 2012 -0800
Merge branch 'master' into next
commit cdda4a586bef2ba7300c04641ac9fb550566f859
Merge: aaf6444 9ce3262
Author: Johnathan Corgan <address@hidden>
Date: Sat Jan 7 12:25:30 2012 -0800
Merge branch 'master' into next
* Use -s ours to skip over release commits on master
commit aaf6444f6f51319491b7bafc70c2e641a551deb6
Merge: 1b80996 9c45fe5
Author: Johnathan Corgan <address@hidden>
Date: Sat Jan 7 11:28:14 2012 -0800
Merge branch 'master' into next
commit 1b80996597fc1800c28e17f77b7cb09f9783d290
Merge: d94c47d e337d7c
Author: Tom Rondeau <address@hidden>
Date: Fri Jan 6 14:44:51 2012 -0500
Merge branch 'master' into next
commit d94c47d652d170760ffca728dc61e45d629fcc04
Merge: 72e8cc8 ab7cfce
Author: Tom Rondeau <address@hidden>
Date: Tue Jan 3 16:30:59 2012 -0500
Merge branch 'master' into next
commit 72e8cc83d795ed49e1cb78e305e32dca892d0bed
Merge: 68301f5 0ab3f9f
Author: Tom Rondeau <address@hidden>
Date: Mon Jan 2 22:49:15 2012 -0500
Merge branch 'master' into next
commit 68301f5ef8af45bfcfe8b66cf75631f322267a7b
Merge: dd84c8d d87f671
Author: Johnathan Corgan <address@hidden>
Date: Mon Jan 2 11:17:29 2012 -0800
Merge branch 'master' into next
commit dd84c8dfcb30617dbac56f49a57c1e363afe643b
Merge: 0cdc6e6 9838bb0
Author: Tom Rondeau <address@hidden>
Date: Fri Dec 30 13:49:14 2011 -0500
Merge branch 'master' into next
Conflicts:
gr-digital/examples/Makefile.am
gr-digital/include/Makefile.am
gr-digital/lib/Makefile.am
gr-digital/python/Makefile.am
gr-digital/swig/Makefile.am
commit 0cdc6e67f575f6c86ad12734f87cf83aed72b102
Merge: 1ea43f5 d0a7de0
Author: Tom Rondeau <address@hidden>
Date: Wed Dec 21 10:56:51 2011 -0500
Merge branch 'master' into next
commit 1ea43f51ad7ef8a43cfea22fa424da36011a0e9a
Merge: 25c494b f88a1e6
Author: Johnathan Corgan <address@hidden>
Date: Tue Dec 20 13:33:09 2011 -0800
Merge branch 'master' into next
commit 25c494b347a9e0c411c8cff0101f6c7c656464f0
Merge: 1f29a38 f395bd6
Author: Tom Rondeau <address@hidden>
Date: Wed Dec 14 22:24:44 2011 -0500
Merge branch 'master' into next
commit 1f29a384ecd6512f5cb0891dbd651aca8ced86ed
Merge: 21a79f6 7b3e152
Author: Tom Rondeau <address@hidden>
Date: Wed Dec 14 22:15:05 2011 -0500
Merge branch 'master' into next
commit 21a79f683ef7c3b0c6337120d056fde452055254
Merge: 7353862 13e3ee1
Author: Johnathan Corgan <address@hidden>
Date: Wed Dec 14 17:00:57 2011 -0800
Merge branch 'master' into next
commit 73538627386205c25b87f7657ab6e8dd774f4cd3
Author: Martin Braun <address@hidden>
Date: Tue Dec 13 21:08:15 2011 -0500
core: WAV sink is now threadsafe; do_update() therefore must be private.
commit 027413aa028afb66da739918bc4ed641600e767f
Merge: d29daf9 7ad9000
Author: Johnathan Corgan <address@hidden>
Date: Tue Dec 13 14:16:32 2011 -0800
Merge branch 'master' into next
commit d29daf9d63b2fbcf141d2a7429a76c2bb1a28729
Merge: 080f2d2 e1ad418
Author: Johnathan Corgan <address@hidden>
Date: Tue Dec 13 13:10:01 2011 -0800
Merge branch 'master' into next
commit 080f2d212daac9297c7f3e3dbe7bd5a13b176c0d
Merge: e6a648a 0ee2298
Author: Johnathan Corgan <address@hidden>
Date: Mon Dec 12 15:31:18 2011 -0800
Merge branch 'master' into next
commit e6a648a80786f58b79689a4cc5697aecf38f3f08
Merge: c51087b fc6151d
Author: Johnathan Corgan <address@hidden>
Date: Sun Dec 11 22:32:16 2011 -0800
Merge branch 'master' into next
commit c51087bb7f005981f4b74c6a48f59a5982721951
Merge: 912cd08 fe21bc6
Author: Johnathan Corgan <address@hidden>
Date: Sun Dec 11 13:07:11 2011 -0800
Merge branch 'master' into next
Conflicts:
config/lf_warnings.m4
volk/config/lf_warnings.m4
commit 912cd08e133dae9fa9ceec055ba23cd970a0c254
Merge: 9c3d747 ad88ab0
Author: Johnathan Corgan <address@hidden>
Date: Thu Dec 8 21:36:10 2011 -0800
Merge branch 'master' into next
commit 9c3d747ef044e346f5c92b5aa9531e523c82ea8e
Merge: 00420d3 64ce938
Author: Johnathan Corgan <address@hidden>
Date: Thu Dec 8 21:34:39 2011 -0800
Merge branch 'master' into next
Used -s ours to skip over version change commit
commit 00420d32081d8252bb37142b2be19a8a7c4dc4c4
Author: Johnathan Corgan <address@hidden>
Date: Thu Dec 8 13:48:48 2011 -0800
Removed autotools, gr-waveform, some cleanup
Nick Foster owes Nick Corgan a six-pack of beer!
commit f52be4a8f0fa203ed206d0e0afc099856eb5bd03
Author: Johnathan Corgan <address@hidden>
Date: Wed Dec 7 17:11:35 2011 -0800
build: update revision to 3.6git
-----------------------------------------------------------------------
hooks/post-receive
--
git://gnuradio.org/jblum
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] git://gnuradio.org/jblum branch, volk_work, created. ffb69bd5bb147e1a52c8c689e88cfaaec38babae,
git version control <=