ecp: merge develop branch into ecp branch
authorDaiYoung Kim <daiyoung777.kim@samsung.com>
Sat, 20 Jul 2013 12:12:30 +0000 (21:12 +0900)
committerDaiYoung Kim <daiyoung777.kim@samsung.com>
Sat, 20 Jul 2013 12:12:30 +0000 (21:12 +0900)
commit33e54afb7082255571d8caee6042f2d39a49b6f6
treea451ceaf963afbc2e1de37cf3f3e156baa066884
parent0991b63092176a6a988021905a1cb79f6e70251a
parentac9a9981d7dea9fc92d0c931f9ff85dbbb1b65a6
ecp: merge develop branch into ecp branch

Signed-off-by: DaiYoung, Kim <daiyoung777.kim@samsung.com>
22 files changed:
qapi-schema.json
tizen/src/Makefile.tizen
tizen/src/ecs-json-streamer.c
tizen/src/ecs-json-streamer.h
tizen/src/ecs.c
tizen/src/ecs.h
tizen/src/ecs_msg.c
tizen/src/ecs_sensor.c
tizen/src/emulator.c
tizen/src/hw/gloffscreen_agl.c
tizen/src/hw/gloffscreen_wgl.c
tizen/src/hw/gloffscreen_xcomposite.c
tizen/src/hw/maru_device_ids.h
tizen/src/hw/maru_virtio_evdi.c
tizen/src/hw/maru_virtio_evdi.h
tizen/src/hw/maru_virtio_keyboard.c
tizen/src/hw/maru_virtio_nfc.c
tizen/src/hw/maru_virtio_nfc.h
tizen/src/hw/maru_virtio_sensor.c
tizen/src/hw/maru_virtio_sensor.h
tizen/src/hw/opengl_exec.c
tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java