review.tizen.org Git - sdk/tools/dynamic-analyzer.git/commit

SRADA-848: Merge branch 'dev_cli' into sdk_merge (2)

Merged with dev_cli changes before PageInfoRegistry introduced.
dev_cli HEAD commit: a4adbd42cc61963b741cb48bd7145c44fc1d7099

Conflicts:
org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/CliFrontend.java
org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/CliInternals.java
org.tizen.dynamicanalyzer/.classpath
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DeviceManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StopTraceManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/GUIAction.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/hierarchy/tree/HierarchyTreeView.java

Change-Id: I4cd5eb9fc642d1e8ed13247a1b3d3b2ab025047e

author	Maria Guseva <m.guseva@samsung.com>
	Tue, 28 Jun 2016 09:14:14 +0000 (12:14 +0300)
committer	Maria Guseva <m.guseva@samsung.com>
	Tue, 28 Jun 2016 09:15:50 +0000 (12:15 +0300)
commit	4b8bbc0cd6b7a28f9bb34649d249e4a1164f0712
tree	dd7eef3d90853870a5c0f15c66b9fc5ab6f0f8bf	tree \| snapshot
parent	0194989f7a74832f5c1914f153092ffdfb384406	commit \| diff
parent	a4adbd42cc61963b741cb48bd7145c44fc1d7099	commit \| diff

org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.properties	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java	diff1 \|	diff2 \|	blob \| history