Merge branch 'tizen' of public:sdk/ide/common-eplugin into tizen 42/10942/1
authorJihoon Song <jihoon80.song@samsung.com>
Tue, 15 Oct 2013 10:40:17 +0000 (19:40 +0900)
committerJihoon Song <jihoon80.song@samsung.com>
Tue, 15 Oct 2013 10:40:17 +0000 (19:40 +0900)
commit2fdb373197ac383209e1b90c2dbaa3e2518cdb95
tree7c3384847cf50a3c5a159d09f89469cff989f93d
parent461aaefc1674659564d21e0c7e4de8caf18ce0c8
parentf0a6f5d5feab6bc63e4ec221eb5e6c23e45b06dd
Merge branch 'tizen' of public:sdk/ide/common-eplugin into tizen

Conflicts:
org.tizen.common.externals/META-INF/MANIFEST.MF
org.tizen.common.externals/about.html
org.tizen.common.externals/build.properties

Change-Id: I42376f3d7ed59a98bf1040795ed05686c92fa5a5
org.tizen.common.externals/META-INF/MANIFEST.MF
org.tizen.common.externals/about.html
org.tizen.common.externals/build.properties