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

Merge remote-tracking branch 'origin/da-web' into tizen

Conflicts:
org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/feature
org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/protocol
org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/setting
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p30/ProtocolFilter30.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/channel/control/ApplicationInst.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/channel/data/DataChannelConstants.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataFactory.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java

Change-Id: I815c348e23bf0ee35bec601bb676eaa4fba309d7
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>

author	heeyoung <heeyoung1008.hwang@samsung.com>
	Sat, 13 Jun 2015 08:17:23 +0000 (17:17 +0900)
committer	heeyoung <heeyoung1008.hwang@samsung.com>
	Sat, 13 Jun 2015 08:17:23 +0000 (17:17 +0900)
commit	dc4a51ec2adfc1551c874b5cadd27dd73859c20e
tree	c7e1be5dcc622b0e7d1548b88de02e2051e82a84	tree \| snapshot
parent	55d58291789b41234cf7dda53d8eae4361a42f1b	commit \| diff
parent	d63a9948ae00e7e85a4754d5af508653e9b45c2a	commit \| diff

org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/ByteUtil.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/feature	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StartTraceManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/ProtocolConstants.java	diff1 \|	\|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogParser.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/AppStartupData.java	\|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataFactory.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/WebAppStartupData.java	\|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/WebProfileData.java	\|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/appStartup/AppStartupDataManager.java	\|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/WebProfileDataMaker.java	\|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceDataManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java	diff1 \|	diff2 \|	blob \| history