Merge branch 'upstream' into tizen_base 14/256114/1 accepted/tizen/6.0/base/tool/20210331.055735 accepted/tizen/6.5/base/tool/20211027.120354 accepted/tizen/base/tool/20210401.231831 submit/tizen_6.0_base/20210329.144650 submit/tizen_6.5_base/20211026.180901 submit/tizen_6.5_base/20211027.183101 submit/tizen_6.5_base/20211027.201001 submit/tizen_base/20210329.144615 tizen_6.5.m2_release
authorDariusz Michaluk <d.michaluk@samsung.com>
Mon, 29 Mar 2021 10:31:09 +0000 (12:31 +0200)
committerDariusz Michaluk <d.michaluk@samsung.com>
Mon, 29 Mar 2021 11:21:07 +0000 (13:21 +0200)
commite27b1a86ce4fda91c753a058dc9fe420dbe85516
treef94185dacebc8f97d8c8848c52a81e9d15b68704
parentf41fc4510669eb460cd13b3e235f9f569c7f9ae4
parent6452d4a6475bb79e4624b8bd81d89c55d615f6c7
Merge branch 'upstream' into tizen_base

Change-Id: I111ce02b09a4927a40086f44f68ecc526622f31d
Configurations/unix-Makefile.tmpl
packaging/openssl1.1.spec