| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | Added Windows DLL resource files | Nicholas Corgan | 2013-03-05 | 1 | -1/+7 |
* | | | Merge remote-tracking branch 'ncorgan/dll-rc-info_next' into next | Tom Rondeau | 2013-03-05 | 1 | -1/+7 |
|\ \ \ |
|
| * | | | Added Windows DLL resource files to next-only branches | Nicholas Corgan | 2013-03-04 | 1 | -1/+7 |
* | | | | Merge branch 'master' into next | Tom Rondeau | 2013-03-04 | 1 | -6/+6 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | log: fixing build if log4cxx is not installed. | Tom Rondeau | 2013-03-04 | 1 | -6/+6 |
* | | | | Merge branch 'master' into next | Tom Rondeau | 2013-03-04 | 1 | -3/+3 |
|\| | | |
|
| * | | | log: more minor fixups integrating gr-logger. | Tom Rondeau | 2013-03-04 | 1 | -3/+3 |
* | | | | Merge branch 'master' into next | Tom Rondeau | 2013-03-03 | 2 | -0/+69 |
|\| | |
| |/ /
|/| | |
|
| * | | log: adding default loggers to all gr_blocks to make using them simpler. | Tom Rondeau | 2013-03-03 | 1 | -17/+26 |
| * | | Merge branch 'master' into gr_log | Tom Rondeau | 2013-03-01 | 8 | -9/+298 |
| |\| |
|
| * | | Merge branch 'master' into gr_log | Tom Rondeau | 2012-09-06 | 13 | -140/+117 |
| |\ \ |
|
| * | | | log: fixed gr_log to be usable in Python. | Tom Rondeau | 2012-06-13 | 1 | -0/+2 |
| * | | | Fixing up the gr-log capabilities. | Tom Rondeau | 2012-06-08 | 2 | -1/+33 |
| * | | | core: Adds a gr-log concept for easy logging at various levels. | Tom Rondeau | 2012-06-07 | 1 | -0/+28 |
* | | | | Merge branch 'master' into next | Tom Rondeau | 2013-02-26 | 1 | -1/+1 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | cmake: adding Boost version 104601 to list of bad Boosts. | Tom Rondeau | 2013-02-26 | 1 | -1/+1 |
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2013-02-21 | 1 | -0/+2 |
|\| | | |
|
| * | | | cmake: Added chrono as a necessary Boost library under MSVC | Nicholas Corgan | 2013-02-19 | 1 | -0/+2 |
* | | | | Merge branch 'master' into next | Tom Rondeau | 2013-02-13 | 1 | -4/+14 |
|\| | | |
|
| * | | | build: allowing user to override check for bad versions of boost. | Tom Rondeau | 2013-02-13 | 1 | -4/+14 |
| * | | | Merge remote-tracking branch 'ncorgan/cmake_boost_fix' into maint | Johnathan Corgan | 2013-02-07 | 1 | -2/+2 |
| |\ \ \ |
|
| * \ \ \ | Merge remote-tracking branch 'ncorgan/fedora-18-cmake' into maint | Johnathan Corgan | 2013-02-07 | 1 | -0/+12 |
| |\ \ \ \ |
|
* | \ \ \ \ | Merge branch 'master' into next | Tom Rondeau | 2013-02-06 | 2 | -2/+14 |
|\ \ \ \ \ \ |
|
| * \ \ \ \ \ | Merge remote-tracking branch 'ncorgan/fedora-18-cmake' | Tom Rondeau | 2013-02-06 | 1 | -0/+12 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | cmake: Added Fedora 18 packaging information | Nicholas Corgan | 2013-01-17 | 1 | -0/+12 |
| * | | | | | | Merge remote-tracking branch 'ncorgan/cmake_boost_fix' | Tom Rondeau | 2013-02-06 | 1 | -2/+2 |
| |\ \ \ \ \ \
| | |_|/ / / /
| |/| | / / /
| | | |/ / /
| | |/| | | |
|
| | * | | | | cmake: Allows Unix systems with /usr/lib64 to use Boost installations in non-... | Nicholas Corgan | 2013-02-01 | 1 | -2/+2 |
| | |/ / / |
|
* | | | | | Merge branch 'master' into next | Tom Rondeau | 2013-02-05 | 1 | -3/+27 |
|\| | | | |
|
| * | | | | build: disable certain Boost versions we know are buggy to fix Issue #513. | Tom Rondeau | 2013-02-05 | 1 | -3/+27 |
| |/ / / |
|
* | | | | Merge master/fix_build_dir_order into next, then fix conflicts and redo come ... | Michael L Dickens | 2013-01-04 | 1 | -0/+156 |
|\| | | |
|
| * | | | GrUseQt4 -> GrSetupQt4, since that's what it really does. | Michael L Dickens | 2013-01-03 | 1 | -0/+0 |
| * | | | GNU Radio version of CMake's "UseQt4" script, which determines header (INCLUD... | Michael L Dickens | 2013-01-01 | 1 | -0/+156 |
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-12-29 | 1 | -1/+2 |
|\| | | |
|
| * | | | Merge branch 'maint' | Johnathan Corgan | 2012-12-29 | 1 | -1/+2 |
| |\ \ \ |
|
| | * | | | cmake: removed Boost 1.52 from allowed versionsmaint-3.6.2 | Johnathan Corgan | 2012-12-29 | 1 | -1/+2 |
* | | | | | ctrlport: fix in cmake for OSX builds of ctrlport. | Tom Rondeau | 2012-12-06 | 1 | -0/+11 |
* | | | | | Merge branch 'next' of gnuradio.org:gnuradio into next | Tom Rondeau | 2012-12-04 | 1 | -3/+7 |
|\ \ \ \ \ |
|
| * | | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-12-04 | 1 | -3/+7 |
| |\| | | | |
|
| | * | | | | Merge branch 'maint' | Johnathan Corgan | 2012-12-04 | 1 | -3/+7 |
| | |\| | | |
|
| | | * | | | swig: tweaks for swig makedepend | Josh Blum | 2012-12-04 | 1 | -3/+7 |
| | * | | | | Merge branch 'maint' | Johnathan Corgan | 2012-12-01 | 1 | -2/+0 |
| | |\| | | |
|
* | | | | | | Merging ctrlport2 into next branch. | Tom Rondeau | 2012-12-03 | 1 | -0/+73 |
|/ / / / / |
|
* | | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-12-01 | 1 | -2/+0 |
|\ \ \ \ \ |
|
| * \ \ \ \ | Merge branch 'maint' | Johnathan Corgan | 2012-12-01 | 1 | -1/+1 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | Revert "Force swig compile ordering in gnuradio-core" | Johnathan Corgan | 2012-12-01 | 1 | -2/+0 |
| * | | | | | Merge branch 'maint' | Johnathan Corgan | 2012-12-01 | 1 | -2/+0 |
| |\ \ \ \ \ |
|
| | * | | | | | Revert "Force swig compile ordering in gnuradio-core" | Johnathan Corgan | 2012-12-01 | 1 | -2/+0 |
* | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-12-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| * | | | | | | Merge branch 'maint' | Johnathan Corgan | 2012-12-01 | 1 | -1/+1 |
| |\ \ \ \ \ \
| | |/ / / / /
| |/| | / / /
| | | |/ / /
| | |/| | | |
|
| | * | | | | cmake: fix typo in cmake swig module | Johnathan Corgan | 2012-12-01 | 1 | -1/+1 |
| | |/ / / |
|