projects / sdk / emulator / emulator-manager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 786eb33 a4be32a)
Merge branch 'develop' into release
authorjihye kim <jihye1128.kim@samsung.com>
Wed, 2 Jan 2013 12:30:33 +0000 (21:30 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Wed, 2 Jan 2013 12:30:33 +0000 (21:30 +0900)
Conflicts:
VERSION

1  2 
package/changelog patch | diff1 | diff2 | blob | history

diff --cc package/changelog
Simple merge
Domain: SDK / Emulator;