summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-27 18:13:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-27 18:13:43 +0200
commit1edc87a665bf4bbc49195b44a9206b02ac0781c9 (patch)
treebda6efa9bb0ea4827a242d852869df3d931d3d00
parent1e51e517be0acf1a5386a817706d0d0f605c4688 (diff)
parentb56b12cd12f32bf11efff05632600a7619584b98 (diff)
Merge commit 'b56b12cd12f32bf11efff05632600a7619584b98'
* commit 'b56b12cd12f32bf11efff05632600a7619584b98': configure: Check for x265_api_get Conflicts: configure See: f4be604f1c4d5cb6480c81c671d646cc16b02017 Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions