projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c1403e 6ec348d)
Merge branch 'release-pre1.0' into develop
authorgiwoong.kim <giwoong.kim@samsung.com>
Tue, 27 Mar 2012 05:56:06 +0000 (14:56 +0900)
committergiwoong.kim <giwoong.kim@samsung.com>
Tue, 27 Mar 2012 05:56:06 +0000 (14:56 +0900)
Conflicts:
package/pkginfo.manifest

1  2 
package/pkginfo.manifest patch | diff1 | diff2 | blob | history

diff --cc package/pkginfo.manifest
index 50bc0e79a77a24633369c09d8835d960414a265c,db77b985b57889029dfabaf0f86d17e094b4b262..cafc0888d72458b77ce7fb25f28e22f811557463
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,5 -1,5 +1,9 @@@
  Package: emulator
++<<<<<<< HEAD
 +Version: 1.2.51
++=======
+ Version: 1.2.53
++>>>>>>> release-pre1.0
  OS: linux
  Build-host-os: linux
  Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
@@@ -8,7 -8,7 +12,11 @@@ Source: emulato
  Description: Tizen Emulator
  
  Package: emulator
++<<<<<<< HEAD
 +Version: 1.2.51
++=======
+ Version: 1.2.53
++>>>>>>> release-pre1.0
  OS: windows
  Build-host-os: windows
  Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
Domain: SDK / Emulator;