diff options
| author | Matt Ettus <matt@ettus.com> | 2010-02-23 19:59:54 -0800 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-02-23 19:59:54 -0800 |
| commit | 0d9c46ae002cad7c144432e86987a81eb33157fc (patch) | |
| tree | 116342f5cbfa09dee7e69d6095b77678f985abc2 /.gitignore | |
| parent | 702c87c3bae259f038d2c10fe32903f391e95de1 (diff) | |
| parent | 904b35c689d38694913606c569a9d324533ff765 (diff) | |
| download | uhd-0d9c46ae002cad7c144432e86987a81eb33157fc.tar.gz uhd-0d9c46ae002cad7c144432e86987a81eb33157fc.tar.bz2 uhd-0d9c46ae002cad7c144432e86987a81eb33157fc.zip | |
Merge branch 'master' into u1e
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index b25c15b81..b275f0e49 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ *~ +\#*\# +a.out |