It's not much use if everything is hardcoded.

Merge master into patched branch to fix conflicts prior to merge back to master

Fix line lengths in newly-added code

Signed-off-by: Alexander Maznev <alexander.maznev@gmail.com>

Signed-off-by: Alexander Maznev <alexander.maznev@gmail.com>

Signed-off-by: Alexander Maznev <alexander.maznev@gmail.com>

make the python code adhere to PEP8

Signed-off-by: Jan Jancar <johny@neuromancer.sk>

Signed-off-by: Andreas Zwinkau <qznc@web.de>

Signed-off-by: Sophie Taylor <sophie@spacekitteh.moe>

Add functions to make the difference between the native and the java code version.

Factor out the version management in the makefiles.

Signed-off-by: Greg Hughes <greg@ghughes.com>

Merge patch required to support Swift projects, from Avery Pierce.

Patch taken from https://github.com/matrix-org/matrix-ios-sdk/files/712987/olm_patch.txt.

Sign-off at https://github.com/matrix-org/matrix-ios-sdk/pull/220#issue-201470911.

OLMKit: Add wrappers for export/import of inbound group sessions

Merged from https://github.com/aapierce0/OLMKit/commits/macOS_port

Sign-off taken from https://github.com/matrix-org/matrix-ios-sdk/pull/218#issue-201062079.

Export and import of megolm session data

Android wrappers for olm library