projects
/
php
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
834b719
014b95a
)
fix merge
author
Remi Collet
<remi@php.net>
Tue, 4 Mar 2014 19:39:00 +0000
(20:39 +0100)
committer
Remi Collet
<remi@php.net>
Tue, 4 Mar 2014 19:39:00 +0000
(20:39 +0100)
1
2
ext/fileinfo/libmagic/softmagic.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
ext/fileinfo/libmagic/softmagic.c
Simple merge