projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6700b6e
92ce6ef
)
Merge branch 'ecp' into develop
author
DaiYoung Kim
<daiyoung777.kim@samsung.com>
Fri, 26 Jul 2013 11:41:19 +0000
(20:41 +0900)
committer
DaiYoung Kim
<daiyoung777.kim@samsung.com>
Fri, 26 Jul 2013 11:41:19 +0000
(20:41 +0900)
1
2
tizen/src/Makefile.tizen
patch
|
diff1
|
diff2
|
blob
|
history
tizen/src/emulator.c
patch
|
diff1
|
diff2
|
blob
|
history
tizen/src/hw/opengl_exec.c
patch
|
diff1
|
diff2
|
blob
|
history
tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tizen/src/Makefile.tizen
Simple merge
diff --cc
tizen/src/emulator.c
Simple merge
diff --cc
tizen/src/hw/opengl_exec.c
Simple merge
diff --cc
tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
Simple merge