summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-04-27 12:34:54 -0400
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-04-27 12:34:54 -0400
commitf59c4b03facd80cab913c6612a899392dd42ebb8 (patch)
treea6f0bcb584fcc6e6cc31261bafdc4f43b2fa7dfc /.gitignore
parent6ec6b613536b7138ee0c87002b10da8fe0c0117d (diff)
parentce75a7675e10e24e7ecd7bc3575c0e0fc1bc34b5 (diff)
downloadqmk_firmware-f59c4b03facd80cab913c6612a899392dd42ebb8.tar.gz
qmk_firmware-f59c4b03facd80cab913c6612a899392dd42ebb8.zip
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 2 insertions, 2 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