projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8ed1df e8ab3f0)
Merge branch 'develop' into tizen_2.3.2
authorjihye424.kim <jihye424.kim@samsung.com>
Mon, 27 Jun 2016 08:28:09 +0000 (17:28 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Mon, 27 Jun 2016 08:28:09 +0000 (17:28 +0900)
Conflicts:
package/pkginfo.manifest

Change-Id: I4df3139ea87076a069841a12624f7cd67c1c635f
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>
1  2 
package/pkginfo.manifest patch | diff1 | diff2 | blob | history

diff --cc package/pkginfo.manifest
Simple merge
Domain: SDK / Emulator;