Merge branch 'upstream' into tizen_base 60/214160/3 accepted/tizen_5.5_base_mobile_hotfix tizen_5.5_base_mobile_hotfix tizen_5.5_tv accepted/tizen/5.5/base/20191030.083132 accepted/tizen/5.5/base/mobile/hotfix/20201023.084954 accepted/tizen/base/20191008.101331 submit/tizen_5.5_base/20191030.000001 submit/tizen_5.5_base_mobile_hotfix/20201023.171501 submit/tizen_base/20191001.092730 tizen_5.5.m2_release
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Wed, 18 Sep 2019 11:17:46 +0000 (13:17 +0200)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Wed, 18 Sep 2019 11:57:31 +0000 (13:57 +0200)
commit02f31943be5fba2402f0818f2ace2ee9b353c49a
tree4a6b6c14de15648296c6bb5271d205d2c2cf101e
parent9095949bb1ad433499af6461601157de9e08de56
parent74bebe883c16093ef8fea456ddd93fbefce98d38
Merge branch 'upstream' into tizen_base

Change-Id: I2aa54578d9f7b1d2fc3ad9d50b3ceb2a2047ee7f
Configurations/unix-Makefile.tmpl
include/internal/cryptlib.h
packaging/openssl1.1.spec