projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7859851
a63ae5c
)
Merge branch 'nine-patch' into develop
author
giwoong.kim
<giwoong.kim@samsung.com>
Thu, 6 Dec 2012 06:55:02 +0000
(15:55 +0900)
committer
giwoong.kim
<giwoong.kim@samsung.com>
Thu, 6 Dec 2012 06:55:03 +0000
(15:55 +0900)
Change-ID: I87b76ee41cdcc7d3fb373d57b3a979f0852e7c5d
1
2
tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
patch
|
diff1
|
diff2
|
blob
|
history
tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
patch
|
diff1
|
diff2
|
blob
|
history
tizen/src/skin/maruskin_server.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
Simple merge
diff --cc
tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
Simple merge
diff --cc
tizen/src/skin/maruskin_server.c
index f038a2df141d3e7c941d51f45ee3df1b302b0912,48bde10b2778756fcd8adb129c95f10ca12df9c8..f038a2df141d3e7c941d51f45ee3df1b302b0912
mode 100644,100755..100755
---
1
/
tizen/src/skin/maruskin_server.c
---
2
/
tizen/src/skin/maruskin_server.c
+++ b/
tizen/src/skin/maruskin_server.c
projects / sdk / emulator / qemu.git / commitdiff