diff options
author | Johnathan Corgan | 2011-07-03 12:13:42 -0700 |
---|---|---|
committer | Johnathan Corgan | 2011-07-03 12:13:42 -0700 |
commit | b25fa9d98bf9e27d036bf3cd44fa996fd0b5b51b (patch) | |
tree | 61f94943828f7dc3420291327e4db23683d127b6 /gruel | |
parent | 3baf863bc0418960ff120fabaa703e710f604377 (diff) | |
parent | 9810b8820631c610f981016276d4def432549b5f (diff) | |
download | gnuradio-b25fa9d98bf9e27d036bf3cd44fa996fd0b5b51b.tar.gz gnuradio-b25fa9d98bf9e27d036bf3cd44fa996fd0b5b51b.tar.bz2 gnuradio-b25fa9d98bf9e27d036bf3cd44fa996fd0b5b51b.zip |
Merge branch 'master' into next
Diffstat (limited to 'gruel')
-rw-r--r-- | gruel/src/python/.gitignore | 1 | ||||
-rw-r--r-- | gruel/src/swig/.gitignore | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/gruel/src/python/.gitignore b/gruel/src/python/.gitignore index b336cc7ce..604b402c5 100644 --- a/gruel/src/python/.gitignore +++ b/gruel/src/python/.gitignore @@ -1,2 +1,3 @@ /Makefile /Makefile.in +/run_tests diff --git a/gruel/src/swig/.gitignore b/gruel/src/swig/.gitignore index b336cc7ce..f99fdb19b 100644 --- a/gruel/src/swig/.gitignore +++ b/gruel/src/swig/.gitignore @@ -1,2 +1,4 @@ /Makefile /Makefile.in +/python +/pmt_swig.py |