summaryrefslogtreecommitdiff
path: root/grc/freedesktop/gnuradio-usrp2_probe.desktop
diff options
context:
space:
mode:
authorTom Rondeau2011-04-08 15:37:29 -0400
committerTom Rondeau2011-04-08 15:37:29 -0400
commit21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb (patch)
tree4e72909a051b0a4ac428252d15f34b53bcc986b6 /grc/freedesktop/gnuradio-usrp2_probe.desktop
parentd7093fd06d0ec37f6ba2841d202fe90f4fa3661e (diff)
parent5c358afd00347f5da7a59dd73ea79cd3df26659d (diff)
downloadgnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.tar.gz
gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.tar.bz2
gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.zip
Merge branch 'master' into constell_obj
Conflicts: gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h gr-audio-oss/src/Makefile.swig.gen gr-audio/swig/Makefile.swig.gen
Diffstat (limited to 'grc/freedesktop/gnuradio-usrp2_probe.desktop')
-rw-r--r--grc/freedesktop/gnuradio-usrp2_probe.desktop7
1 files changed, 0 insertions, 7 deletions
diff --git a/grc/freedesktop/gnuradio-usrp2_probe.desktop b/grc/freedesktop/gnuradio-usrp2_probe.desktop
deleted file mode 100644
index c71a092b1..000000000
--- a/grc/freedesktop/gnuradio-usrp2_probe.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=USRP2 Probe
-Exec=usrp2_probe
-Categories=Development;
-Icon=gnuradio-grc