From: giwoong.kim Date: Mon, 17 Sep 2012 04:55:19 +0000 (+0900) Subject: Merge branch 'release' into develop X-Git-Tag: TizenStudio_2.0_p2.3~1312 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7bcaa9d09299bdc82bbf4dcef37ec9562a7878a;p=sdk%2Femulator%2Fqemu.git Merge branch 'release' into develop Conflicts: package/pkginfo.manifest tizen/src/hw/gloffscreen_glx.c tizen/src/hw/gloffscreen_wgl.c tizen/src/hw/gloffscreen_xcomposite.c tizen/src/hw/maru_camera_linux_pci.c tizen/src/hw/maru_camera_win32_pci.c --- d7bcaa9d09299bdc82bbf4dcef37ec9562a7878a diff --cc package/pkginfo.manifest index bc91c45,e101806..1fb7ba6 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@@ -1,4 -1,4 +1,4 @@@ - Version: 1.3.55 -Version: 1.3.53 ++Version: 1.3.56 Maintainer: Yeong-Kyoon Lee Source: emulator