projects / sdk / emulator / emulator-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3abb291 065ab9d)
Merge branch 'develop_linux_3.14' into tizen_2.3.2
authorSooyoung Ha <yoosah.ha@samsung.com>
Mon, 20 Jun 2016 03:45:08 +0000 (12:45 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Mon, 20 Jun 2016 03:45:13 +0000 (12:45 +0900)
Change-ID: I5590119d18b8db15bab8dc5282fb603daf6ee908
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
1  2 
package/changelog patch | diff1 | diff2 | blob | history
package/pkginfo.manifest patch | diff1 | diff2 | blob | history

diff --cc package/changelog
Simple merge
diff --cc package/pkginfo.manifest
index e3edeb1237f814d4e7b4f916152657213c9484e8,f0e66ccfd94a1a94af70357157ad7626c182d24c..677a89bf4ea09f2005549bffe023db872a4fe793
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,8 -1,8 +1,8 @@@
  Source: emulator-kernel
- Version: 3.14.19
+ Version: 3.14.20
  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
Domain: SDK / Emulator;