Merge branch 'upstream' into tizen 63/67263/3 accepted/tizen/common/20160427.144109 accepted/tizen/ivi/20160428.002447 accepted/tizen/mobile/20160428.004551 accepted/tizen/tv/20160428.002324 accepted/tizen/wearable/20160428.002544 submit/tizen/20160427.070140
authorSeonah Moon <seonah1.moon@samsung.com>
Tue, 26 Apr 2016 05:52:32 +0000 (14:52 +0900)
committertaesub kim <taesub.kim@samsung.com>
Tue, 26 Apr 2016 08:32:45 +0000 (01:32 -0700)
commit0be6abcfa9907d66495e75d33667479a62639bd9
tree8e698cd20b68375d8420ededc10aea2cddba5146
parent7a9f915fa6be8c8955ff2c59169538a4d0349080
parent0a710b32648c435f792f5993fdefa2d96f802580
Merge branch 'upstream' into tizen

Upgrade version 7.48.0

Change-Id: Ibb643307cb5add844a733bb23cb6051bc0fdb100
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>
CMakeLists.txt
Makefile.am
Makefile.in
configure.ac
packaging/curl.spec