diff options
| author | Didier Loiseau <didierloiseau+git@gmail.com> | 2016-09-11 01:26:47 +0200 |
|---|---|---|
| committer | Didier Loiseau <didierloiseau+git@gmail.com> | 2016-09-11 01:26:47 +0200 |
| commit | b9014c757599ca288be07629ad1d00ef66c033f1 (patch) | |
| tree | ba056e704e76327c597e25d1be200c4c991efeb8 /.gitignore | |
| parent | 60a826923d5a6b0dbe416b0837608149ab82e470 (diff) | |
| parent | 5010df3d8b68a53c382b853c7c2e45922975b631 (diff) | |
Merge remote-tracking branch 'remotes/jackhumbert/master' into bépo
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 8b8c45169d..07bbf13db1 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,12 +14,18 @@ keyboard/planck/dfu-programmer.exe tags *~ build/ +.build/ *.bak .vagrant/ +quantum/version.h +.idea/ +CMakeLists.txt .DS_STORE -# Eclipse Settings +# Eclipse/PyCharm/Other IDE Settings .cproject .project .settings/ - +.idea +.browse.VC.db* +*.stackdump |