summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorJoshua T <joshua@sonofone.net>2016-09-01 07:40:46 -0500
committerJoshua T <joshua@sonofone.net>2016-09-01 07:40:46 -0500
commit5520b0022fc6cd3dff805eb31ed4bb7e4385ee2a (patch)
tree0346d24fd7a8905486a687c68084af25022c4312 /.gitattributes
parentb0c3d596816c178ccd94738a3866a08b71027d0d (diff)
parente28d151a8a1d458f3c18897c6095decc17b0c3a1 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 8fd1fd7525..92dfc3c617 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -91,3 +91,4 @@ GRAPHICS
# hex files
*.hex binary
+*.eep binary