diff options
| author | Nathan Sharfi <me@ngalt.com> | 2016-07-31 23:02:25 +0200 |
|---|---|---|
| committer | Nathan Sharfi <me@ngalt.com> | 2016-07-31 23:02:25 +0200 |
| commit | d889648d5373b7ff77dc7bc4b369c628e8336b45 (patch) | |
| tree | 35c6eb194417242958baf54b36f0ff3a56e378f1 /.gitignore | |
| parent | 6428069eb70f5cc47ac1f3f9acf3daea14fb9097 (diff) | |
| parent | b25dbc484d639210c53d8e13f79cf5a77f2faaaa (diff) | |
| download | qmk_firmware-d889648d5373b7ff77dc7bc4b369c628e8336b45.tar.gz qmk_firmware-d889648d5373b7ff77dc7bc4b369c628e8336b45.tar.xz | |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
# Conflicts:
# keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
# keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index a082ea22e..849143352 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,11 @@ -keyboard/planck/dfu-programmer.exe .dep *.o *.eep *.elf *.hex +!util/bootloader.hex +!quantum/tools/eeprom_reset.hex +*.log *.lss *.lst *.map @@ -12,8 +14,11 @@ keyboard/planck/dfu-programmer.exe tags *~ build/ +.build/ *.bak .vagrant/ +.idea/ +CMakeLists.txt .DS_STORE # Eclipse/PyCharm/Other IDE Settings @@ -21,3 +26,4 @@ build/ .project .settings/ .idea +.browse.VC.db*
\ No newline at end of file |