diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-04-27 12:34:54 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-04-27 12:34:54 -0400 |
| commit | f59c4b03facd80cab913c6612a899392dd42ebb8 (patch) | |
| tree | a6f0bcb584fcc6e6cc31261bafdc4f43b2fa7dfc | |
| parent | 6ec6b613536b7138ee0c87002b10da8fe0c0117d (diff) | |
| parent | ce75a7675e10e24e7ecd7bc3575c0e0fc1bc34b5 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
135 files changed, 21021 insertions, 9165 deletions
diff --git a/.gitignore b/.gitignore index 8b8c45169d..a082ea22e4 100644 --- a/.gitignore +++ b/.gitignore @@ -16,8 +16,8 @@ build/ .vagrant/ .DS_STORE -# Eclipse Settings +# Eclipse/PyCharm/Other IDE Settings .cproject .project .settings/ - +.idea diff --git a/README.md b/README.md index ab7373023a..d205 |