projects / sdk / ide / nativeplatform-eplugin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d3f804e fcf93d3)
Merge branch 'beta' into develop
authorTaeyoung Son <taeyoung2.son@samsung.com>
Thu, 23 Feb 2012 09:42:31 +0000 (18:42 +0900)
committerTaeyoung Son <taeyoung2.son@samsung.com>
Thu, 23 Feb 2012 09:42:31 +0000 (18:42 +0900)
Conflicts:
org.tizen.nativeplatform/templates/InhouseFrameworkPackages/AgentProject/template.xml
package/pkginfo.manifest

Change-Id: If8a698a20e49047691ebe58559e6765b3acd4e2b


Trivial merge
Domain: SDK / Native IDE;