diff options
| author | tmk <nobody@nowhere> | 2014-11-24 05:50:33 +0100 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-11-24 05:50:33 +0100 |
| commit | 363950982a291c3bfa03ac6362061b1d37dc06b0 (patch) | |
| tree | c46fc53fe00137ced3c8edd3d0766ee844f77516 /.gitignore | |
| parent | eb90ed6238426db9367e294abfaefb5de07564f5 (diff) | |
| parent | 60096e11c77980ca6b54674c5b68248e8aa15d8d (diff) | |
| download | qmk_firmware-363950982a291c3bfa03ac6362061b1d37dc06b0.tar.gz qmk_firmware-363950982a291c3bfa03ac6362061b1d37dc06b0.tar.xz | |
Merge branch 'rn42' into merge_rn42
Conflicts:
.gitignore
common.mk
common/debug_config.h
common/print.h
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 0fd85b531..f3f46872a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ *.sym tags *~ +build/ +*.bak |