summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan2012-03-08 16:48:31 -0800
committerJohnathan Corgan2012-03-08 16:48:31 -0800
commitaabc6bd3ef6061cc48a8cf87be89a3f6094cf2fe (patch)
tree59861037459ff097386f6027b56aeaf994d64145
parent57ad294b333d185cfd6952f01ea03f88370d2b8d (diff)
parente9a9b3d602a4d715789ab1b83929ff3934bf4086 (diff)
downloadgnuradio-aabc6bd3ef6061cc48a8cf87be89a3f6094cf2fe.tar.gz
gnuradio-aabc6bd3ef6061cc48a8cf87be89a3f6094cf2fe.tar.bz2
gnuradio-aabc6bd3ef6061cc48a8cf87be89a3f6094cf2fe.zip
Merge branch 'maint'
-rw-r--r--gr-noaa/.gitignore1
-rw-r--r--gr-vocoder/swig/.gitignore1
2 files changed, 2 insertions, 0 deletions
diff --git a/gr-noaa/.gitignore b/gr-noaa/.gitignore
index 282522db0..2f7735b5e 100644
--- a/gr-noaa/.gitignore
+++ b/gr-noaa/.gitignore
@@ -1,2 +1,3 @@
Makefile
Makefile.in
+*.pc
diff --git a/gr-vocoder/swig/.gitignore b/gr-vocoder/swig/.gitignore
index b336cc7ce..6a0410b79 100644
--- a/gr-vocoder/swig/.gitignore
+++ b/gr-vocoder/swig/.gitignore
@@ -1,2 +1,3 @@
/Makefile
/Makefile.in
+/run_guile_tests