projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7b19fb 5e2b380)
Merge branch 'tizen_qemu_1.6' into develop
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 12 Sep 2013 08:22:11 +0000 (17:22 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 12 Sep 2013 08:22:11 +0000 (17:22 +0900)
1  2 
Makefile.target patch | diff1 | diff2 | blob | history
configure patch | diff1 | diff2 | blob | history
tizen/emulator_configure.sh patch | diff1 | diff2 | blob | history
tizen/src/Makefile.tizen patch | diff1 | diff2 | blob | history
tizen/src/hw/gloffscreen_agl.c patch | diff1 | diff2 | blob | history
tizen/src/hw/maru_board.c patch | diff1 | diff2 | blob | history
vl.c patch | diff1 | diff2 | blob | history

diff --cc Makefile.target
index 6b20d09,409b843..43e34b1
mode 100644,100755..100644
--- 1/Makefile.target
--- 2/Makefile.target
+++ b/Makefile.target
diff --cc configure
Simple merge
diff --cc tizen/emulator_configure.sh
Simple merge
diff --cc tizen/src/Makefile.tizen
Simple merge
diff --cc tizen/src/hw/gloffscreen_agl.c
Simple merge
diff --cc tizen/src/hw/maru_board.c
Simple merge
diff --cc vl.c
Simple merge
Domain: SDK / Emulator;