diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-06-24 16:06:38 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-06-24 16:06:38 -0400 |
| commit | d97764ce6040aff8023b43323b4bc048a907a1fd (patch) | |
| tree | dda4ba74128454fd271ffe7dcbe673f2ae0b4c08 /gnuradio-core/src/lib/gnuradio-config-info.cc | |
| parent | b142f64573b8b7b15a94fc9c64e2f26264a5b144 (diff) | |
| parent | bf8700a226091c5ce0130a3819a4c12b9d9981a6 (diff) | |
Merge branch 'master' into my_qtsink
Conflicts:
gr-qtgui/include/qtgui_sink_c.h
gr-qtgui/include/qtgui_sink_f.h
gr-qtgui/include/qtgui_util.h
gr-qtgui/lib/ConstellationDisplayPlot.cc
gr-qtgui/lib/FrequencyDisplayPlot.cc
gr-qtgui/lib/SpectrumGUIClass.cc
gr-qtgui/lib/TimeDomainDisplayPlot.cc
gr-qtgui/lib/WaterfallDisplayPlot.cc
gr-qtgui/lib/qtgui_sink_c.cc
gr-qtgui/lib/qtgui_sink_f.cc
gr-qtgui/lib/spectrumdisplayform.cc
Diffstat (limited to 'gnuradio-core/src/lib/gnuradio-config-info.cc')
| -rw-r--r-- | gnuradio-core/src/lib/gnuradio-config-info.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnuradio-core/src/lib/gnuradio-config-info.cc b/gnuradio-core/src/lib/gnuradio-config-info.cc index 6fa53b8776..d3e6454fd8 100644 --- a/gnuradio-core/src/lib/gnuradio-config-info.cc +++ b/gnuradio-core/src/lib/gnuradio-config-info.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2009 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, @@ -52,7 +52,7 @@ main(int argc, char **argv) std::cout << desc << std::endl; return 1; } - + if (vm.count("prefix")) std::cout << gr_prefix() << std::endl; |