projects / sdk / emulator / emulator-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87c0b82 914e90f)
Merge branch 'develop_linux_3.14' into platform_2.3.2
authorSooyoung Ha <yoosah.ha@samsung.com>
Tue, 12 Jul 2016 11:10:55 +0000 (20:10 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Tue, 12 Jul 2016 11:11:11 +0000 (20:11 +0900)
Change-Id: Ibd9eddda3f52ec401f403ab517fe93e09a479d12
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 53715770b93e006c08ba374fe05534eb33b0e268,871797d96deebf831e09f26d95d3d38e44a0e848..eac0771394751cd1f20ee8cd6e6c13b3e2d06e6c
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,8 -1,8 +1,8 @@@
  Source: emulator-kernel
- Version: 3.14.21
+ Version: 3.14.22
  Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
  
 -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
Domain: SDK / Emulator;