Merge commit 'edce617a5' into merge-2.4 (-s ours)
[profile/ivi/opencv.git] / .gitattributes
1 *           text=auto whitespace=trailing-space,space-before-tab,-indent-with-non-tab,tab-in-indent,tabwidth=4
2
3 .git*       text export-ignore
4
5 *.aidl         text
6 *.appxmanifest text
7 *.bib          text
8 *.c            text
9 *.cl           text
10 *.conf         text
11 *.cpp          text
12 *.css_t        text
13 *.cu           text
14 *.cxx          text
15 *.def          text
16 *.filelist     text
17 *.h            text
18 *.hpp          text
19 *.htm          text
20 *.html         text
21 *.hxx          text
22 *.i            text
23 *.idl          text
24 *.java         text
25 *.js           text
26 *.m            text
27 *.mk           text
28 *.mm           text
29 *.plist        text
30 *.properties   text
31 *.py           text
32 *.qrc          text
33 *.qss          text
34 *.S            text
35 *.sbt          text
36 *.scala        text
37 *.sty          text
38 *.tex          text
39 *.txt          text
40 *.xaml         text
41
42 # reST underlines/overlines can look like conflict markers
43 *.rst          text conflict-marker-size=80
44
45 *.cmake         text whitespace=tabwidth=2
46 *.cmakein       text whitespace=tabwidth=2
47 *.in            text whitespace=tabwidth=2
48 CMakeLists.txt  text whitespace=tabwidth=2
49
50 *.avi       binary
51 *.bmp       binary
52 *.exr       binary
53 *.ico       binary
54 *.jpeg      binary
55 *.jpg       binary
56 *.png       binary
57
58 *.a         binary
59 *.so        binary
60 *.dll       binary
61 *.jar       binary
62
63 *.pdf       binary
64 *.pbxproj   binary
65 *.vec       binary
66 *.doc       binary
67 *.dia       binary
68
69 *.xml                      -text whitespace=cr-at-eol
70 *.yml                      -text whitespace=cr-at-eol
71 .project                   -text whitespace=cr-at-eol merge=union
72 .classpath                 -text whitespace=cr-at-eol merge=union
73 .cproject                  -text whitespace=cr-at-eol merge=union
74 org.eclipse.jdt.core.prefs -text whitespace=cr-at-eol merge=union
75
76 *.bat       text eol=crlf
77 *.cmd       text eol=crlf
78 *.cmd.tmpl  text eol=crlf
79 *.dsp       text eol=crlf -whitespace
80 *.sln       text eol=crlf -whitespace
81 *.vcproj    text eol=crlf -whitespace merge=union
82 *.vcxproj   text eol=crlf -whitespace merge=union
83
84 *.sh        text eol=lf