projects / sdk / emulator / emulator-manager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fea1460 a687732)
Merge branch 'develop' into release
authorjihye kim <jihye1128.kim@samsung.com>
Thu, 29 Nov 2012 14:44:30 +0000 (23:44 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Thu, 29 Nov 2012 14:44:30 +0000 (23:44 +0900)
Conflicts:
package/build.macos-64
package/changelog
package/pkginfo.manifest
supplement/emulator-manager-mac-app.sh

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

diff --cc package/pkginfo.manifest
index 1cea562,878ee51..7ba5a7b
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,5 -1,5 +1,4 @@@
--Source: emulator-manager
- Version: 1.3.60
+ Version: 1.3.61
  Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
  
  Package: emulator-manager
Domain: SDK / Emulator;