Merge branch 'rn42' into merge_rn42

[tmk_firmware.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0fd85b53143e75f8b4c4ebdee59d1d30520b2644..f3f46872a07e990dcf0f8dca6c8de554d0fdce66 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@
 *.sym
 tags
 *~
+build/
+*.bak