projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
| inline |
side by side
(parent:
1ebe4d9
)
typo
author
Michael Wallner
<mike@php.net>
Fri, 4 Apr 2014 12:14:43 +0000
(14:14 +0200)
committer
Michael Wallner
<mike@php.net>
Fri, 4 Apr 2014 12:14:43 +0000
(14:14 +0200)
.gitattributes
patch
|
blob
|
history
diff --git
a/.gitattributes
b/.gitattributes
index 40a888438919e2b134fc35b8e5f61398e071a488..a55a7ae95546df79042da73d8e32162b575db1ff 100644
(file)
--- a/
.gitattributes
+++ b/
.gitattributes
@@
-1,2
+1,2
@@
package.xml merge=touch
-php_http.h merge=touc
+php_http.h merge=touc
h