Merge branch 'develop' into release
authordonghee yang <donghee.yang@samsung.com>
Thu, 27 Dec 2012 02:59:24 +0000 (11:59 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Thu, 27 Dec 2012 02:59:24 +0000 (11:59 +0900)
commite5c75417fd22954aff912e80da68ae1c0f492873
tree0d69d4d936608b337989c61de61ca4e00451f079
parent61bf80869b2f0a6e311bbd53ad17fa6f754dde2a
parent3884a98b9101d9030e7dd5de2d5ed5ab621768b8
Merge branch 'develop' into release

Conflicts:
org.tizen.nativeplatform/src/org/tizen/nativeplatform/wizards/TizenPlatformProjectWizard.java
package/changelog
package/pkginfo.manifest

Change-Id: I81a1ee9ef28789a1fd8a019eb26a384a15a1089b
package/changelog
package/pkginfo.manifest