summaryrefslogtreecommitdiffstats
path: root/doc/examples
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2014-04-21 17:24:19 +0200
committerMichael Niedermayer <[email protected]>2014-04-21 17:24:43 +0200
commita68d4f55debc1775f65313bd65ce78f0f773b7e1 (patch)
tree7b8d43007d98f84b28b951297369d6dd2217180b /doc/examples
parentfdcdfb36b74b3ae3cc2f2d6db4d3255d91dcd178 (diff)
parentce364088ef53dbaf90e74a471d12b732b697e0cd (diff)
Merge commit 'ce364088ef53dbaf90e74a471d12b732b697e0cd' into release/1.1
* commit 'ce364088ef53dbaf90e74a471d12b732b697e0cd': configure: Support older version of openjpeg1 Conflicts: configure See: 58b8d268d97109b3df0fd77feb7acde3f139c4e1 Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'doc/examples')
0 files changed, 0 insertions, 0 deletions