Merge branch 'tizen' into tizen_qemu_1.7
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 3 Jan 2014 02:11:45 +0000 (11:11 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 3 Jan 2014 02:11:45 +0000 (11:11 +0900)
1  2 
tizen/src/ecs/ecs.c
ui/input.c

Simple merge
diff --cc ui/input.c
Simple merge