aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING.LGPLv3
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-30 10:42:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-30 10:42:40 +0200
commit93b3a5edffa30db752b9780f4c30ccfbe849afce (patch)
treeec5455059f693c35f29688b4070ee1dbb65c3ad5 /COPYING.LGPLv3
parent4cf6e0008187cf75ac86f3bd12592b5f6ac9d91e (diff)
parent10db1a9bca46b0f760a1263d47142b2f57e195d7 (diff)
downloadffmpeg-93b3a5edffa30db752b9780f4c30ccfbe849afce.tar.gz
Merge commit '10db1a9bca46b0f760a1263d47142b2f57e195d7'
* commit '10db1a9bca46b0f760a1263d47142b2f57e195d7': avutil/tree: K&R formatting cosmetics Conflicts: libavutil/tree.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.LGPLv3')
0 files changed, 0 insertions, 0 deletions