Merge branch 'develop_linux_3.14' into tizen_2.3.2
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 16 Jun 2016 08:18:49 +0000 (17:18 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 16 Jun 2016 08:19:11 +0000 (17:19 +0900)
Change-Id: Ic89e13c9525f7703de18c70ce9bc207963b85d40
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
1  2 
package/changelog
package/pkginfo.manifest

Simple merge
index 11389e81f3f0e6ea5cdc5309e0ee57e0a2809d1c,048735be901a7b74ec64376213b67adfd03bcffe..e3edeb1237f814d4e7b4f916152657213c9484e8
@@@ -1,8 -1,8 +1,8 @@@
  Source: emulator-kernel
- Version: 3.14.18
+ Version: 3.14.19
  Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
  
 -Package: 3.0-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