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:
d18234f
7ce88e5
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 5 Jan 2014 22:23:53 +0000
(23:23 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 5 Jan 2014 22:23:53 +0000
(23:23 +0100)
* qatar/master:
cmdutils: update copyright year to 2014.
Conflicts:
cmdutils.c
See:
0b1cfc4f28d81a8a49fdd5589b2eed06477abd61
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge