diff options
| author | Matt Ettus | 2009-09-24 22:34:06 -0700 |
|---|---|---|
| committer | Matt Ettus | 2009-09-24 22:34:06 -0700 |
| commit | 5c46578ba936de57e80594540804c964aa408f73 (patch) | |
| tree | cf164f8e3d80b78971fb2987740b7d957ee1f306 /gr-noaa/.gitignore | |
| parent | 35ada01aa8ae838d6d75bf063725218fa7e18f5f (diff) | |
| parent | 16474a0adb44dc81a8338a9c4a9a6dcab6f6328f (diff) | |
| download | gnuradio-5c46578ba936de57e80594540804c964aa408f73.tar.gz gnuradio-5c46578ba936de57e80594540804c964aa408f73.tar.bz2 gnuradio-5c46578ba936de57e80594540804c964aa408f73.zip | |
Merge commit 'origin' into new_eth
Conflicts:
.gitignore
Diffstat (limited to 'gr-noaa/.gitignore')
| -rw-r--r-- | gr-noaa/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gr-noaa/.gitignore b/gr-noaa/.gitignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/gr-noaa/.gitignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in |