projects
/
platform
/
upstream
/
lz4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7628d9d
e0e29cf
)
Merge branch 'master' into coverity_scan
author
Yann Collet
<cyan@fb.com>
Sun, 14 Jan 2018 05:09:02 +0000
(21:09 -0800)
committer
Yann Collet
<cyan@fb.com>
Sun, 14 Jan 2018 05:09:02 +0000
(21:09 -0800)
1
2
.gitattributes
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
.gitattributes
index
6212bd4
,
6212bd4
..
9eb12c0
---
1
/
.gitattributes
---
2
/
.gitattributes
+++ b/
.gitattributes
@@@
-19,3
-19,3
+19,6
@@@
# Windows
*.bat text eol=crlf
*.cmd text eol=crlf
++
++# .travis.yml merging
++.travis.yml merge=ours