projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 07551a8 ac362aa)
Merge branch 'release' into develop
authorgiwoong.kim <giwoong.kim@samsung.com>
Mon, 17 Sep 2012 04:55:19 +0000 (13:55 +0900)
committergiwoong.kim <giwoong.kim@samsung.com>
Mon, 17 Sep 2012 04:55:19 +0000 (13:55 +0900)
commitd7bcaa9d09299bdc82bbf4dcef37ec9562a7878a
tree51c91f1a2549b2fca6973531274edb3b4d091c3btree | snapshot
parent07551a86219a31995c16df7a21b2651434e29469commit | diff
parentac362aad8450ae2ed17df3205135b5845ccfb79ccommit | diff
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
package/pkginfo.manifest diff1 | diff2 | blob | history
Domain: SDK / Emulator;