projects
/
platform
/
upstream
/
opencv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/2.4' into merge-2.4
[platform/upstream/opencv.git]
/
.gitattributes
diff --git
a/.gitattributes
b/.gitattributes
index
35df6ca
..
7497ee1
100644
(file)
--- a/
.gitattributes
+++ b/
.gitattributes
@@
-23,6
+23,7
@@
*.idl text
*.java text
*.js text
+*.m text
*.mk text
*.mm text
*.plist text