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

Merge branch 'tizen' into da-db

Conflicts:
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/MessageProcess.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/format/CommonColumns.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/format/LogFormat.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java

Change-Id: Iad6f8a439e0e7bd6253ad4b77d03ced38196c4e7
Signed-off-by: greatim <jaewon81.lim@samsung.com>

author	greatim <jaewon81.lim@samsung.com>
	Fri, 19 Sep 2014 03:46:41 +0000 (12:46 +0900)
committer	greatim <jaewon81.lim@samsung.com>
	Fri, 19 Sep 2014 03:46:41 +0000 (12:46 +0900)
commit	9d43d4a07ecbac8d2278d477442b07ab24a6f587
tree	99c6a270f09a7aa230d177ce5af5545f560b2e3b	tree \| snapshot
parent	aec90e610e3cfa58a943b853c602202d04df5fc5	commit \| diff
parent	519a6b2c83321dc6e67cce1d364f84ca00861c5a	commit \| diff

org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java	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/common/AnalyzerManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AutoStartManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/BaseCallstackManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/channel/data/BasicDataMessage.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.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/logparser/SWAPLogParser.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/SystemData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChart.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListTable.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.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/timeline/calltrace/CallTraceTable.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopLogProcessor.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDataManager.java	\|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java	\|	diff2 \|	blob \| history