diff options
author | Tom Rondeau | 2011-07-17 17:25:57 -0400 |
---|---|---|
committer | Tom Rondeau | 2011-07-17 17:25:57 -0400 |
commit | f7b9a0c6922c86cd54c1300ab45209d8e2db13df (patch) | |
tree | 5ede528cd302e85bc40edcad876525659f4e1ed2 /gr-digital/python/.gitignore | |
parent | caa4af889f54a696d3a533c77c5016df82f2987c (diff) | |
parent | 04409d2ba42ac5b372a7b6bb7e9c8de5722d76d7 (diff) | |
download | gnuradio-f7b9a0c6922c86cd54c1300ab45209d8e2db13df.tar.gz gnuradio-f7b9a0c6922c86cd54c1300ab45209d8e2db13df.tar.bz2 gnuradio-f7b9a0c6922c86cd54c1300ab45209d8e2db13df.zip |
Merge branch '8psk' into next
Conflicts:
gr-msdd6000/src/Makefile.swig.gen
Diffstat (limited to 'gr-digital/python/.gitignore')
-rw-r--r-- | gr-digital/python/.gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gr-digital/python/.gitignore b/gr-digital/python/.gitignore new file mode 100644 index 000000000..604b402c5 --- /dev/null +++ b/gr-digital/python/.gitignore @@ -0,0 +1,3 @@ +/Makefile +/Makefile.in +/run_tests |