projects / sdk / emulator / emulator-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf34e98 e0ccec9)
Merge branch 'develop_linux_3.14' into platform_2.3.2
authorJinhyung Jo <jinhyung.jo@samsung.com>
Tue, 18 Oct 2016 08:00:08 +0000 (17:00 +0900)
committerJinhyung Jo <jinhyung.jo@samsung.com>
Tue, 18 Oct 2016 08:12:09 +0000 (17:12 +0900)
Change-Id: I27e496ab64e679b12082d40febde2dd095cfd4c0
Signed-off-by: Jinhyung Jo <jinhyung.jo@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 88bc406a001de2571190959f87c7a158b4b7d418,0571da8990e0fd9a3a67d97e30cd3df17b5e2667..a237267358568d10a15d433d969b25566b910f0d
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,8 -1,8 +1,8 @@@
  Source: emulator-kernel
- Version: 3.14.24
+ Version: 3.14.25
  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;