Merge commit 'ce364088ef53dbaf90e74a471d12b732b697e0cd' into release/1.1

Browse Source

* commit 'ce364088ef53dbaf90e74a471d12b732b697e0cd':
  configure: Support older version of openjpeg1

Conflicts:
	configure

See: 58b8d268d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2014-04-21 17:24:19 +02:00

parent fdcdfb36b7 ce364088ef

commit a68d4f55de

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available