projects / sdk / tools / dynamic-analyzer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 002069c 9185803)
Merge branch 'da-protocol' into tizen 27/40827/1
authorgreatim <jaewon81.lim@samsung.com>
Tue, 9 Jun 2015 10:40:39 +0000 (19:40 +0900)
committergreatim <jaewon81.lim@samsung.com>
Tue, 9 Jun 2015 10:40:39 +0000 (19:40 +0900)
commitba6b5072924de85f15c85cb35a18157a72319c41
tree300b8e4ef6b875b65e2552b04ac4c28caccc75ebtree | snapshot
parent002069ce6322eb14865987bb950f857f599f85c8commit | diff
parent91858031662386b40a2eba88119dd2ae94194232commit | diff
Merge branch 'da-protocol' into tizen

Signed-off-by: greatim <jaewon81.lim@samsung.com>
Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/DataChannelThread.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java

Change-Id: I58c91337f0b1fd03b18807b3addab45fad1c3431
13 files changed:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.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/protocol/p30/Communicator30.java | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/DataChannelThread.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotDataManager.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/chart/ProcessMemoryChart.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.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/setting/FeatureDialogFeaturesTreeTableToggleRenderer.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogOptionPage.java diff1 | diff2 | blob | history
Domain: SDK / Dynamic Analysis;