diff options
| author | Josh Blum | 2011-10-11 21:35:35 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-10-11 21:35:35 -0700 |
| commit | 1259a01a9479071bd1729a9c9496444f0a72509b (patch) | |
| tree | 55350454454a119fb230cdbaadfb27d361f191ec /gr-digital/doc/.gitignore | |
| parent | 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (diff) | |
| parent | 06860c309153890a6a42babfbedf230eb24f0042 (diff) | |
| download | gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.gz gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.bz2 gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.zip | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Conflicts:
gr-digital/include/digital_constellation.h
Diffstat (limited to 'gr-digital/doc/.gitignore')
| -rw-r--r-- | gr-digital/doc/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gr-digital/doc/.gitignore b/gr-digital/doc/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gr-digital/doc/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in |