From: Jinhyung Jo Date: Fri, 12 May 2017 08:25:58 +0000 (+0900) Subject: Merge branch 'develop_linux_3.14' into tizen_studio_1.2_p2.3.2 X-Git-Tag: TizenStudio_2.0_p2.3.2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fopensrc_p2.3.2;p=sdk%2Femulator%2Femulator-kernel.git Merge branch 'develop_linux_3.14' into tizen_studio_1.2_p2.3.2 Change-Id: I01496e862af18614b501c9ca4e1d4f98705481b2 Signed-off-by: Jinhyung Jo --- cdf77110cf2816bedc4ffa078a6c91e4b48fa4af diff --cc package/pkginfo.manifest index 4e29414d7fb8,1a0662915b76..3299d8114d81 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@@ -1,8 -1,8 +1,8 @@@ Source: emulator-kernel - Version: 3.14.26 + Version: 3.14.27 Maintainer: SeokYeon Hwang -Package: 2.4-emulator-kernel-x86 +Package: 2.3.2-emulator-kernel-x86 OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64 Build-host-os: ubuntu-64 Description: Tizen x86 Emulator Kernel