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:
2290077
79fdbfd
)
Merge commit '79fdbfdb3e50f3f906903e027714ee04c1a00e89'
author
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Thu, 12 May 2016 13:25:04 +0000
(14:25 +0100)
committer
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Thu, 12 May 2016 13:26:19 +0000
(14:26 +0100)
This commit is purposely skipped because it doesn't work very well
with what our img2enc.c supports.
* commit '
79fdbfdb3e50f3f906903e027714ee04c1a00e89
':
img2enc: Refactor the atomic renaming code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Trivial merge
OSDN Git Service
