OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4c592c3
0f257e2
)
Merge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 30 Nov 2014 17:17:51 +0000
(18:17 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 30 Nov 2014 17:18:20 +0000
(18:18 +0100)
* commit '
0f257e29c5520b215e573e7e3abde8e5a4743309
':
Treat all '*.pnm' files as non-text file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge