readium / readium-sdk

A C++ ePub renderer SDK

BSD 3-Clause "New" or "Revised" License

385 stars 164 forks source link

Merge branch 'master' into upstream_master #266

Closed johny-milkboxltd closed 7 years ago

johny-milkboxltd commented 7 years ago

General Instructions

Please use a short, but meaningful title.
Delete everything in italics before submitting the pull request
Make sure to fill in as much information as possible

This pull request is a Work In Progress|Finalized|Other

(choose ONE from the above list and delete the others)

Related issue(s) and/or pull request(s)

Example: See also #NUMBER

Test cases, sample files

(if relevant, please indicate public EPUB URL(s), or whether you can share ebook(s) privately)

Additional information

Please provide any and all information that might help us

Conflicts:

Platform/Android/Android.mk

Platform/Android/build.gradle

Platform/Apple/RDServices/Main/RDContainer.mm

UnitTests/UnitTests.1

ePub3/ePub/container.cpp