aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2015-03-24 12:51:54 -0700
committerMartin Braun <martin.braun@ettus.com>2015-03-24 12:51:54 -0700
commitbb9539ba565ab6534f2773e05938932e02a7248b (patch)
treec7e8f1920a587d39c922b66846a18fcfdee9b61a
parentb850dfb583e05e500fd7e78af416a92f1a1e046e (diff)
parent30fbd1f1fe6b589243526bb9cdc1c396e2f81a05 (diff)
downloaduhd-bb9539ba565ab6534f2773e05938932e02a7248b.tar.gz
uhd-bb9539ba565ab6534f2773e05938932e02a7248b.tar.bz2
uhd-bb9539ba565ab6534f2773e05938932e02a7248b.zip
Merge branch 'maint'
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..80fb99fff
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*~
+*swp