Merge branch 'ecp' into develop
authorDaiYoung Kim <daiyoung777.kim@samsung.com>
Fri, 26 Jul 2013 11:41:19 +0000 (20:41 +0900)
committerDaiYoung Kim <daiyoung777.kim@samsung.com>
Fri, 26 Jul 2013 11:41:19 +0000 (20:41 +0900)
1  2 
tizen/src/Makefile.tizen
tizen/src/emulator.c
tizen/src/hw/opengl_exec.c
tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java

Simple merge
Simple merge
Simple merge