- Committer: Josh Blum
- Date: 2011-09-29 05:59:51 UTC
- mfrom: (2058.4.11)
- Revision ID: git-v1:b06328b4adee941fe62f12a848cc903097711bdd
Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
Conflicts:
gr-digital/lib/Makefile.am
gr-digital/python/__init__.py
Conflicts:
gr-digital/lib/Makefile.am
gr-digital/python/__init__.py
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
cmake
|
2088 | 12 years ago | Josh Blum | gr: squashed cmakelists.txt into one commit |
|
||
|
config
|
1 | 17 years ago | jcorgan | Houston, we have a trunk. git-svn-id: http://gnu |
|
||
|
debian
|
2088 | 12 years ago | Josh Blum | gr: squashed cmakelists.txt into one commit |
|
||
|
docs
|
1 | 17 years ago | jcorgan | Houston, we have a trunk. git-svn-id: http://gnu |
|
||
|
dtools
|
1 | 17 years ago | jcorgan | Houston, we have a trunk. git-svn-id: http://gnu |
|
||
|
gcell
|
780 | 16 years ago | eb | Merged gcell, the Cell SPE scheduler and RPC mecha |
|
||
|
gnuradio-core
|
1 | 17 years ago | jcorgan | Houston, we have a trunk. git-svn-id: http://gnu |
|
||
|
gnuradio-examples
|
1 | 17 years ago | jcorgan | Houston, we have a trunk. git-svn-id: http://gnu |
|
||
|
gr-atsc
|
1 | 17 years ago | jcorgan | Houston, we have a trunk. git-svn-id: http://gnu |
|
||
|
gr-audio
|
2028 | 13 years ago | Tom Rondeau | Merge branch 'master' into turbo |
|
||
|
gr-comedi
|
1 | 17 years ago | jcorgan | Houston, we have a trunk. git-svn-id: http://gnu |
|
||
|
gr-digital
|
2058 | 12 years ago | Tom Rondeau | Merge branch '8psk' into next Conflicts: gr-msdd |
|
||
|
gr-gcell
|
818 | 16 years ago | eb | Merged eb/gcell -r8215:8243 into trunk. This adds |
|
||
|
gr-gsm-fr-vocoder
|
2127 | 12 years ago | Josh Blum | Merge branch 'next' into digital Conflicts: gnur |
|
||
|
gr-howto-write-a-block
|
1 | 17 years ago | jcorgan | Houston, we have a trunk. git-svn-id: http://gnu |
|
||
|
gr-howto-write-a-block-cmake
|
2121 | 12 years ago | Josh Blum | Merge branch 'next' into digital |
|
||
|
gr-noaa
|
1736 | 14 years ago | Johnathan Corgan | Merge branch 'wip/gr-noaa' of http://gnuradio.org/ |
|
||
|
gr-pager
|
216 | 17 years ago | jcorgan | Restore gr-pager to trunk. git-svn-id: http://gn |
|
||
|
gr-qtgui
|
1121 | 15 years ago | trondeau | Merging qtgui branch-r9068:9837: this ads a qtgui_ |
|
||
|
gr-radio-astronomy
|
1 | 17 years ago | jcorgan | Houston, we have a trunk. git-svn-id: http://gnu |
|
||
|
gr-run-waveform
|
2028 | 13 years ago | Tom Rondeau | Merge branch 'master' into turbo |
|
||
|
gr-trellis
|
38 | 17 years ago | eb | Merged anastas/wip changes r3156:3218 into trunk. |
|
||
|
gr-uhd
|
2028 | 13 years ago | Tom Rondeau | Merge branch 'master' into turbo |
|
||
|
gr-usrp
|
1 | 17 years ago | jcorgan | Houston, we have a trunk. git-svn-id: http://gnu |
|
||
|
gr-usrp2
|
975 | 15 years ago | jcorgan | Merged r9433:9527 from features/gr-usrp2 into trun |
|
||
|
gr-utils
|
573 | 16 years ago | jcorgan | Merged r6271:6278 from jcorgan/t182 into trunk. I |
|
||
|
gr-video-sdl
|
1 | 17 years ago | jcorgan | Houston, we have a trunk. git-svn-id: http://gnu |
|
||
|
gr-vocoder
|
2059 | 12 years ago | Johnathan Corgan | gr-vocoder: add skeleton top-level component |
|
||
|
gr-wxgui
|
1 | 17 years ago | jcorgan | Houston, we have a trunk. git-svn-id: http://gnu |
|
||
|
grc
|
936 | 15 years ago | jcorgan | Merged changeset r9285:9377 from jblum/grc into tr |
|
||
|
gruel
|
861 | 15 years ago | jcorgan | Merged -r8639:8641 from jcorgan/gruel into trunk. |
|
||
|
usrp
|
1 | 17 years ago | jcorgan | Houston, we have a trunk. git-svn-id: http://gnu |
|
||
|
usrp2
|
975 | 15 years ago | jcorgan | Merged r9433:9527 from features/gr-usrp2 into trun |
|
||
|
volk
|
2028 | 13 years ago | Tom Rondeau | Merge branch 'master' into turbo |
|
||
|
vrt
|
2028 | 13 years ago | Tom Rondeau | Merge branch 'master' into turbo |
|
||
.gitattributes |
1758.1.1 | 14 years ago | Johnathan Corgan | Add .gitattributes to fix CRLF problems on MinGW/M | 323 bytes |
|
|
|
.gitignore |
2088 | 12 years ago | Josh Blum | gr: squashed cmakelists.txt into one commit | 700 bytes |
|
|
|
AUTHORS |
937 | 15 years ago | eb | moved author attribution out of individual files a | 1.1 KB |
|
|
bootstrap |
1920.14.2 | 13 years ago | Tom Rondeau | volk: Updating build system so that volk configure | 1 KB |
|
|
|
ChangeLog |
2043.5.1 | 12 years ago | Johnathan Corgan | Fix URL in ChangeLog | 931 bytes |
|
|
|
CMakeLists.txt |
2116.1.20 | 12 years ago | Josh Blum | cmake: support for importing executables when doin | 7.6 KB |
|
|
|
config.guess |
2042 | 13 years ago | Johnathan Corgan | Update config.sub and config.guess with latest can | 43.4 KB |
|
|
|
config.sub |
2042 | 13 years ago | Johnathan Corgan | Update config.sub and config.guess with latest can | 34.3 KB |
|
|
|
configure-cell-cross |
1354 | 15 years ago | eb | disable gr-audio-jack when cross-compiling until s | 1.9 KB |
|
|
|
configure.ac |
2068 | 12 years ago | Johnathan Corgan | gr-vocoder: removed gr-codec2-vocoder | 13.1 KB |
|
|
|
COPYING |
522 | 16 years ago | eb | Updated license from GPL version 2 or later to GPL | 34.3 KB |
|
|
|
gnuradio-pkg_chk.conf |
712 | 16 years ago | gdt | Note that this file is somewhat useful as a depend | 1.9 KB |
|
|
|
Guile-TODO |
1920.1.461 | 13 years ago | Eric Blossom | Update TODO | 2.7 KB |
|
|
|
INSTALL |
662 | 16 years ago | eb | doc cleanup git-svn-id: http://gnuradio.org/svn/g | 9.1 KB |
|
|
|
Makefile.am |
1920.1.324 | 13 years ago | Eric Blossom | Major Makefile.am housecleaning. Passes distcheck | 1.5 KB |
|
|
|
Makefile.common |
2058.2.64 | 12 years ago | Tom Rondeau | digital: adding CPM C++ hier block, which adds a h | 4.6 KB |
|
|
|
Makefile.common.spu |
830 | 16 years ago | eb | Merged eb/gcell-wip -r8302:8307 into trunk. This | 1.3 KB |
|
|
|
Makefile.gen.gen |
1390 | 15 years ago | jcorgan | Merged r10554:10595 from michaelld/am_swig_4 into | 2.6 KB |
|
|
|
Makefile.par.gen |
1390 | 15 years ago | jcorgan | Merged r10554:10595 from michaelld/am_swig_4 into | 2.7 KB |
|
|
|
Makefile.swig |
1982.1.39 | 13 years ago | Ben Reynwar | Removing docstring generation from this branch. | 7 KB |
|
|
|
Makefile.swig.gen.t |
1982.1.39 | 13 years ago | Ben Reynwar | Removing docstring generation from this branch. | 4.5 KB |
|
|
|
NEWS |
1689 | 14 years ago | jcorgan | Test check-in 2, ignore. git-svn-id: http://gnura | 849 bytes |
|
|
|
README |
1920.1.526 | 13 years ago | Tom Rondeau | Adding required legal notice of what a copyright y | 9.3 KB |
|
|
|
README-win32-mingw-short.txt |
9 | 17 years ago | eb | Cleaned up top-level README, and fixed or deleted | 3.9 KB |
|
|
|
README.building-boost |
1203 | 15 years ago | jcorgan | Merged r10071:10164 from features/cppdb-test into | 941 bytes |
|
|
|
README.hacking |
1549 | 15 years ago | jcorgan | Doc cleanup git-svn-id: http://gnuradio.org/svn/g | 10.8 KB |
|
|
|
README.ps3 |
657 | 16 years ago | eb | Merged -r6847:6850 from eb/trial-merge into trunk. | 417 bytes |
|
|
|
run_tests.sh.in |
1897 | 14 years ago | Johnathan Corgan | Missed updates for omnithread/mblock removal | 3.6 KB |
|
|
|
setup_guile_test_env.in |
1920.1.473 | 13 years ago | Eric Blossom | Add guile/.libs to libpath | 3.9 KB |
|
|
|
version.sh |
2057 | 12 years ago | Johnathan Corgan | build: fix incorrect version on next branch | 61 bytes |
|
|