projects / sdk / emulator / emulator-manager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a4eada 918df63)
Merge branch 'develop' into release
authorjihye kim <jihye1128.kim@samsung.com>
Mon, 26 Nov 2012 07:09:19 +0000 (16:09 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Mon, 26 Nov 2012 07:09:19 +0000 (16:09 +0900)
Conflicts:
package/changelog
package/pkginfo.manifest

1  2 
VERSION patch | diff1 | diff2 | blob | history

diff --cc VERSION
index 997bba2,2cabede..54ef5dd
--- 1/VERSION
--- 2/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 2.0.0a4
 -2.0.0a4-RC3
++2.0.0-RC1
Domain: SDK / Emulator;