aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorchrysn2012-09-13 22:32:28 +0200
committerchrysn2012-09-13 22:32:28 +0200
commit0508f30d2dcd74008e76005c735dc47b7cea5132 (patch)
tree01930442983ac158eca9746f6756ea440e9db15c /.gitignore
parent282891f8a61d6be822da978e44f0ed3e807c0cd6 (diff)
parentdcd98dde86c68340e950d12b078d24fd30bef625 (diff)
Merge branch 'master' into efm32
Conflicts: Doxyfile Makefile
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index f0c86ce..63b7b48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,7 @@
*.swp
\#*
.\#*
+*~
+*.map
+*.log
+doxygen/