Merge branch 'master' of github.com:jackhumbert/qmk_firmware

[qmk_firmware.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 49eb2d5587e6c5c62e0180f7bf73f35cbe2da6b7..8491433524d9c7c8b1f0878995c8fc7fb2616bfc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@
 *.eep
 *.elf
 *.hex
+!util/bootloader.hex
+!quantum/tools/eeprom_reset.hex
+*.log
 *.lss
 *.lst
 *.map
@@ -11,5 +14,16 @@
 tags
 *~
 build/
+.build/
 *.bak
 .vagrant/
+.idea/
+CMakeLists.txt
+.DS_STORE
+
+# Eclipse/PyCharm/Other IDE Settings
+.cproject
+.project
+.settings/
+.idea
+.browse.VC.db*
\ No newline at end of file