Merge branch 'new_connection' into develop
authorshingil.kang <shingil.kang@samsung.com>
Tue, 10 Sep 2013 23:33:02 +0000 (08:33 +0900)
committershingil.kang <shingil.kang@samsung.com>
Tue, 10 Sep 2013 23:35:34 +0000 (08:35 +0900)
commit25fcbc3f7abf91a3623a52b5646d6c93a19c50f6
tree69e3c918218be7167c73c266302a5c3ad262103c
parent454aef059cca83de0421cd0a925a2ec00a218f56
parent90a6a3102930cadb7497b396e086c033ac5c74aa
Merge branch 'new_connection' into develop

Conflicts:
org.tizen.common.connection/.classpath
org.tizen.common.connection/plugin.xml
org.tizen.common.connection/src/org/tizen/common/connection/debugtools/OnDemandInstall.java
org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorer.java
org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerLabelProvider.java
org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java
org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionUIMessages.properties
org.tizen.common.connection/src/org/tizen/common/connection/log/LogTab.java
org.tizen.common.connection/src/org/tizen/common/connection/sdblib/dnd/FileEntryDropAdapter.java
org.tizen.common.connection/src/org/tizen/common/connection/ui/TizenRemoteFileDialog.java
org.tizen.common.gom/src/org/tizen/common/gom/launch/GomLaunchData.java
org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/GomSmartLauncher.java
org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/handler/GomSmartLaunchCycleHandler.java
org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/messages/GomMessages.java
org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/messages/GomMessages.properties
org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/ui/GomDialog.java
org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
org.tizen.common.sdblib/src/org/tizen/sdblib/DeviceMonitor.java
org.tizen.common.sdblib/src/org/tizen/sdblib/IDevice.java
org.tizen.common.sdblib/src/org/tizen/sdblib/SdbHelper.java
org.tizen.common.sdblib/src/org/tizen/sdblib/SmartDevelopmentBridge.java
org.tizen.common.sdblib/src/org/tizen/sdblib/SmartDevelopmentBridgetConstants.java
org.tizen.common.sdblib/src/org/tizen/sdblib/command/Command.java
org.tizen.common.sdblib/src/org/tizen/sdblib/command/MatcherFactory.java
org.tizen.common.sdblib/src/org/tizen/sdblib/command/matcher/KeywordBasedMatcher.java
org.tizen.common.sdblib/src/org/tizen/sdblib/exception/SyncException.java
org.tizen.common.sdblib/src/org/tizen/sdblib/receiver/FileEntryFactory.java
org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntry.java
org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntryInputStream.java
org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntryOutputStream.java
org.tizen.common.sdblib/src/org/tizen/sdblib/service/SyncResult.java
org.tizen.common.sdblib/src/org/tizen/sdblib/service/SyncService.java
org.tizen.common.sdblib/src/org/tizen/sdblib/service/SyncServiceConstants.java
org.tizen.common.sdblib/src/org/tizen/sdblib/util/ArrayHelper.java
org.tizen.common.sdblib/src/org/tizen/sdblib/util/DeviceUtil.java
org.tizen.common.sdblib/src/org/tizen/sdblib/util/FileEntryUtil.java
org.tizen.common.sdblib/src/org/tizen/sdblib/util/FilenameUtil.java
org.tizen.common.sdblib/src/org/tizen/sdblib/util/Log.java
org.tizen.common.sdblib/test/src/org/tizen/sdblib/DeviceTest.java
org.tizen.common.sdblib/test/src/org/tizen/sdblib/SdbHelperTest.java
org.tizen.common.sdblib/test/src/org/tizen/sdblib/receiver/MultiLineReceiverTest.java
org.tizen.common.sign/src/org/tizen/common/sign/command/SignCommand.java
org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningPreferencePage.java
org.tizen.common.ui/plugin.xml
org.tizen.common.verrari.realm/src/org/tizen/common/verrari/template/DirectoryTemplate.java
org.tizen.common.verrari/templates/cli/jqm-masterdetail/index.html
org.tizen.common.verrari/templates/cli/jqm-masterdetail/section1.html
org.tizen.common.verrari/templates/cli/jqm-masterdetail/section2.html
org.tizen.common.verrari/templates/cli/jqm-multipage/index.html
org.tizen.common.verrari/templates/cli/jqm-navigation/index.html
org.tizen.common.verrari/templates/cli/jqm-navigation/section1.html
org.tizen.common.verrari/templates/cli/jqm-navigation/section2.html
org.tizen.common.verrari/templates/cli/jqm-singlepage/index.html
org.tizen.common.verrari/templates/jar/jqm-masterdetail.jar
org.tizen.common.verrari/templates/jar/jqm-multipage.jar
org.tizen.common.verrari/templates/jar/jqm-navigation.jar
org.tizen.common.verrari/templates/jar/jqm-singlepage.jar
org.tizen.common.verrari/templates/jar/tizen-basic.jar
org.tizen.common.verrari/templates/jar/tizenwebuifw-masterdetail.jar
org.tizen.common.verrari/templates/jar/tizenwebuifw-multipage.jar
org.tizen.common.verrari/templates/jar/tizenwebuifw-navigation.jar
org.tizen.common.verrari/templates/jar/tizenwebuifw-singlepage.jar
org.tizen.common/src/org/tizen/common/Messages.java
org.tizen.common/src/org/tizen/common/core/application/InstallPathConfig.java
org.tizen.common/src/org/tizen/common/core/application/UpdateManager.java
org.tizen.common/src/org/tizen/common/core/command/sdb/PullSdbCommand.java
org.tizen.common/src/org/tizen/common/core/command/sdb/PushSdbCommand.java
org.tizen.common/src/org/tizen/common/messages.properties
org.tizen.common/src/org/tizen/common/rds/RdsDeltaDetector.java
org.tizen.common/src/org/tizen/common/rds/RdsDeployer.java
org.tizen.common/src/org/tizen/common/sdb/command/SdbCommand.java
org.tizen.common/src/org/tizen/common/ui/dialog/LocaleDialog.java
org.tizen.common/src/org/tizen/common/ui/dialog/NewIconDialog.java
org.tizen.common/src/org/tizen/common/util/ProjectUtil.java
org.tizen.common/src/org/tizen/common/util/log/UserInteraction.java
package/changelog
package/pkginfo.manifest

Change-Id: Idbc7b1ad9441ee09c0549cabcbf7e6ba062f0d94
org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorer.java
org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java
org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionUIMessages.java
org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionUIMessages.properties