diff options
author | Toni <jeder@mail1a.de> | 2016-08-13 09:24:24 +0200 |
---|---|---|
committer | Toni <jeder@mail1a.de> | 2016-08-13 09:24:24 +0200 |
commit | e0aa2169055f554a3cb87208b1e73a6b2707405b (patch) | |
tree | 6c74a1f7284f385b99a231ef0c1c805fab1083e5 /.gitignore | |
parent | cafa528b88c097f02ae92a5b15b015f5653cefe7 (diff) | |
parent | 098951905d527c19043de75ef262ac9679ec452b (diff) | |
download | qmk_firmware-e0aa2169055f554a3cb87208b1e73a6b2707405b.tar.gz qmk_firmware-e0aa2169055f554a3cb87208b1e73a6b2707405b.zip |
Merge remote-tracking branch 'origin/master' into iso_split_rshift
update from Upstream
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 8491433524..8c85d6ffa8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ build/ .build/ *.bak .vagrant/ +quantum/version.h .idea/ CMakeLists.txt .DS_STORE @@ -26,4 +27,4 @@ CMakeLists.txt .project .settings/ .idea -.browse.VC.db*
\ No newline at end of file +.browse.VC.db* |