summaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorcyBerta <richy@cyborgsociety.org>2013-11-10 23:37:25 +0100
committercyBerta <richy@cyborgsociety.org>2013-11-10 23:37:25 +0100
commit2cc19682a050e7675de4a8e5f470c7a408b46ac4 (patch)
treed86a6acae0af635222965baaf91cb0d885d3b65b /openssl
parentfe6ff2c1250f75419f9fb54752eda2bdc6302f5d (diff)
parent5e43d1ea5436af16f227a98fee495f707c885a96 (diff)
Merge remote-tracking branch 'base/develop' into develop-merge
Conflicts: AndroidManifest.xml
Diffstat (limited to 'openssl')
0 files changed, 0 insertions, 0 deletions