diff options
| author | Josh Blum <josh@joshknows.com> | 2010-01-22 11:58:32 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-01-22 11:58:32 -0800 |
| commit | da57b53f803af2598a06fa89e6da2797e5e65155 (patch) | |
| tree | bfc0772d0cb7d880d1f91ed936baa02d8ac8d155 /usrp1/megacells/.gitignore | |
| parent | 7bf8a6df381a667134b55701993c6770d32bc76b (diff) | |
| parent | a170b9b42345794429486dd4f3316e84ea2cc871 (diff) | |
| download | uhd-da57b53f803af2598a06fa89e6da2797e5e65155.tar.gz uhd-da57b53f803af2598a06fa89e6da2797e5e65155.tar.bz2 uhd-da57b53f803af2598a06fa89e6da2797e5e65155.zip | |
Merge branch 'usrp1' into usrp2
Conflicts:
.gitignore
Diffstat (limited to 'usrp1/megacells/.gitignore')
| -rw-r--r-- | usrp1/megacells/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usrp1/megacells/.gitignore b/usrp1/megacells/.gitignore new file mode 100644 index 000000000..c2de89b27 --- /dev/null +++ b/usrp1/megacells/.gitignore @@ -0,0 +1 @@ +/db |