Merge branch 'tizen_3.0_develop' into tizen_3.0
authorJihye Won <jihye.won1@samsung.com>
Fri, 30 Oct 2015 08:16:39 +0000 (17:16 +0900)
committerJihye Won <jihye.won1@samsung.com>
Fri, 30 Oct 2015 08:17:32 +0000 (17:17 +0900)
Conflicts:
package/3.0-emulator-lib-dev.install.macos-64
package/3.0-emulator-lib-dev.install.ubuntu-32
package/3.0-emulator-lib-dev.install.ubuntu-64
package/3.0-emulator-lib-dev.install.windows-32
package/3.0-emulator-lib-dev.install.windows-64
package/build.macos-64
package/build.ubuntu-32
package/build.ubuntu-64
package/build.windows-32
package/build.windows-64
package/changelog
package/pkginfo.manifest

Change-Id: I17f9b634410974fbc53452c1ddaf0b2c7236861e
Signed-off-by: Jihye Won <jihye.won1@samsung.com>

Trivial merge