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)
commit44063ef1ed23ce632d7624a990d9d0fad4485dac
tree9b722601b689d60d08bc0dbe3ba95b0891013687
parentfea146049c860168a01e6b5b7e33b9737b2419b4
parenta687732c0342ca957c31d1412928da788447e902
Merge branch 'develop' into release

Conflicts:
package/build.macos-64
package/changelog
package/pkginfo.manifest
supplement/emulator-manager-mac-app.sh
package/pkginfo.manifest