projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1d716c5)
[Title] merge pkginfo.manifest
authorgiwoong.kim <giwoong.kim@samsung.com>
Tue, 27 Mar 2012 05:58:04 +0000 (14:58 +0900)
committergiwoong.kim <giwoong.kim@samsung.com>
Tue, 27 Mar 2012 05:58:04 +0000 (14:58 +0900)
[Type]
[Module] Emulator
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

package/pkginfo.manifest patch | blob | history

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index cafc0888d72458b77ce7fb25f28e22f811557463..db77b985b57889029dfabaf0f86d17e094b4b262 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,9 +1,5 @@
 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>
@@ -12,11 +8,7 @@ Source: emulator
 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;