projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
| inline |
side by side
Merge branch 'master' into phpng
[m6w6/ext-http]
/
.gitattributes
diff --git
a/.gitattributes
b/.gitattributes
index e52f7caa2e393a763542c4c0b8df6bdf6a728658..a55a7ae95546df79042da73d8e32162b575db1ff 100644
(file)
--- a/
.gitattributes
+++ b/
.gitattributes
@@
-1
+1,2
@@
package.xml merge=touch
+php_http.h merge=touch