diff options
author | Didier Loiseau <didierloiseau+git@gmail.com> | 2016-01-23 16:44:59 +0100 |
---|---|---|
committer | Didier Loiseau <didierloiseau+git@gmail.com> | 2016-01-23 16:44:59 +0100 |
commit | ad2a4c32039e6ac2f64aacb42dd274cc0ac46f97 (patch) | |
tree | 61d36827ff7244c41937e71f8dd30fa68730ca07 /.gitignore | |
parent | fb181304083b884c60a30f64a634b592479aed6d (diff) | |
parent | 306f183b1c8ef6e33a7dafb0d8a89e5a7aebac69 (diff) | |
download | qmk_firmware-ad2a4c32039e6ac2f64aacb42dd274cc0ac46f97.tar.gz |
Merge remote-tracking branch 'jackhumbert/master' into typematrix
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index bae2658b0..49eb2d558 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ tags *~ build/ *.bak +.vagrant/ |