Merge branch 'develop' of gerrithost:sdk/ide/product into develop
authorTaeyoung Son <taeyoung2.son@samsung.com>
Tue, 28 Feb 2012 07:41:36 +0000 (16:41 +0900)
committerTaeyoung Son <taeyoung2.son@samsung.com>
Tue, 28 Feb 2012 07:41:36 +0000 (16:41 +0900)
commit89f67ae86ad9ddbb2e0836e43966b0d6528d2232
treed0bbd1fbacd2ed4eda9a6108bde5b6102494b885
parent65d51a0d534706d2eb263cc1cf7faa5ea1bf4077
parent376348f0083fa75fecba374d07609401ff4f1cb0
Merge branch 'develop' of gerrithost:sdk/ide/product into develop

Conflicts:
org.tizen.base.feature/feature.xml

Change-Id: Ie39d37e473ba68c46f5cba3d4fb28d871ff52e4c
org.tizen.base.feature/feature.xml
package/build.linux