Merge remote-tracking branch 'remotes/origin/da-interactive' into tizen 75/41375/1 tizen
authorjungwook.ryu <jungwook.ryu@samsung.com>
Sat, 13 Jun 2015 13:39:31 +0000 (22:39 +0900)
committerjungwook.ryu <jungwook.ryu@samsung.com>
Sat, 13 Jun 2015 13:39:37 +0000 (22:39 +0900)
commitaf71af502c208fe1922698cf527c7921d7c5f0c1
tree6baca62c01caf51b7a8d8c1dbc3330cbf0e830c0
parent8ae4b64cacbd128dffaa74409247e09f754cad60
parent54f091371a6655c2cf7e5d9d981a71f47d9f16e6
Merge remote-tracking branch 'remotes/origin/da-interactive' into tizen

Conflicts:
org.tizen.dynamicanalysis.ide.native.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/communication/DAServerManager.java

Change-Id: I121a5b88cd125320042765617ae69cc0233fadc2
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
org.tizen.dynamicanalysis.ide.native.eplugin/icon/mark_interactive_profiling.png
org.tizen.dynamicanalysis.ide.native.eplugin/icon/view_icon_interactive_profiling.png
org.tizen.dynamicanalysis.ide.native.eplugin/plugin.xml
org.tizen.dynamicanalysis.ide.native.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/communication/DAServerManager.java
org.tizen.dynamicanalysis.ide.native.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/nl/Labels.properties