Patch has been received by e-mail, Signed-off-by: Arnaud Fontaine <arnaud.fontaine@ssi.gouv.fr>

Signed-off-by: Wilfried Klaebe <w+gitstuff@chaos.in-kiel.de>

The code for this change is taken from
https://stackoverflow.com/a/30225575/4929236



This patch is Signed-Off-By: Marcel Radzio <marcel@radzio-sh.de>

From 4a82d31e8cb808a04956fc847ed0ec0ff322b956 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Wed, 3 Jan 2018 21:37:43 -0500
Subject: [PATCH] fix some typos in JavaScript library

Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>

because we may not have pep8 installed at the system level

Signed-off-by: Alexey Rusakov <ktirf@users.sf.net>

This disrupts building at least with Visual Studio.

Signed-off-by: Alexey Rusakov <ktirf@users.sf.net>

Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>

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.