Merge branch 'develop' into release
authorjihye kim <jihye1128.kim@samsung.com>
Mon, 17 Dec 2012 01:13:43 +0000 (10:13 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Mon, 17 Dec 2012 01:13:43 +0000 (10:13 +0900)
Conflicts:
package/changelog
package/pkginfo.manifest

1  2 
VERSION
package/changelog

diff --cc VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
--2.0.0-RC2
++2.0.0-RC3
@@@ -10,7 -22,7 +22,7 @@@
  * 1.3.63
  - change emulator-manager.app for mac
  == jihye kim <jihye1128.kim@samsung.com> 2012-11-29
-- 
++
  * 1.3.62
  - change em.icns file
  == jihye kim <jihye1128.kim@samsung.com> 2012-11-29