projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a020c1d a0d0ae6)
Merge remote-tracking branch 'score/develop' into tizen-vigs-develop
authorStanislav Vorobiov <s.vorobiov@samsung.com>
Fri, 31 May 2013 09:23:51 +0000 (13:23 +0400)
committerStanislav Vorobiov <s.vorobiov@samsung.com>
Fri, 31 May 2013 09:23:51 +0000 (13:23 +0400)
Conflicts:
package/changelog
package/pkginfo.manifest

1  2 
Makefile.target patch | diff1 | diff2 | blob | history
configure patch | diff1 | diff2 | blob | history
tizen/src/Makefile.tizen patch | diff1 | diff2 | blob | history
tizen/src/emulator.c patch | diff1 | diff2 | blob | history

diff --cc Makefile.target
Simple merge
diff --cc configure
Simple merge
diff --cc tizen/src/Makefile.tizen
index 147c45e7b9ce186d748b2651586e665413d5f4e9,60276ccb6616a1611f6d9178c0a5750a110604b2..5f953310180c5297009760c2947af2b5e1df7773
mode 100755,100644..100644
--- 1/tizen/src/Makefile.tizen
--- 2/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
diff --cc tizen/src/emulator.c
Simple merge
Domain: SDK / Emulator;