Merge branch 'upstream' into tizen_5.5_base 05/228205/1 accepted/tizen/5.5/base/20200410.123450 submit/tizen_5.5_base/20200319.154047 submit/tizen_5.5_base/20200321.084633 submit/tizen_5.5_base/20200402.063358 submit/tizen_5.5_base/20200403.150713
authorDariusz Michaluk <d.michaluk@samsung.com>
Thu, 19 Mar 2020 14:46:21 +0000 (15:46 +0100)
committerDariusz Michaluk <d.michaluk@samsung.com>
Thu, 19 Mar 2020 14:47:12 +0000 (15:47 +0100)
commit7857e6812136bb5fdac8286eba9428147f60be78
tree9e2ece670c7abe01da254a1c14b53537edbb50d1
parent032c451cba439eac099a258cef702a2b39188559
parent1ba6c8ad2f8812bcde216c7ee3071b78aa45ee3e
Merge branch 'upstream' into tizen_5.5_base

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