Merge branch 'upstream' into tizen_5.5_base 05/231705/1 accepted/tizen_5.5_base_wearable_hotfix tizen_5.5_base_wearable_hotfix accepted/tizen/5.5/base/20200508.133211 accepted/tizen/5.5/base/wearable/hotfix/20201023.081321 submit/tizen_5.5_base/20200506.104230 submit/tizen_5.5_base_wearable_hotfix/20201023.155601
authorDariusz Michaluk <d.michaluk@samsung.com>
Thu, 23 Apr 2020 15:40:38 +0000 (17:40 +0200)
committerDariusz Michaluk <d.michaluk@samsung.com>
Thu, 23 Apr 2020 15:41:06 +0000 (17:41 +0200)
commitcf1a42ca41c15331a09594c381be30adb3ad5f59
tree59b1de896c8b3c8ad6e1f1c4c1b1f0b771f7d722
parent7857e6812136bb5fdac8286eba9428147f60be78
parent5bf6b0efe56c2141b34657caf0bd2477838fdcf8
Merge branch 'upstream' into tizen_5.5_base

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