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

projects / sdk / tools / dynamic-analyzer.git / commit

author	jungwook.ryu <jungwook.ryu@samsung.com>
	Tue, 26 Aug 2014 09:00:33 +0000 (18:00 +0900)
committer	jungwook.ryu <jungwook.ryu@samsung.com>
	Tue, 26 Aug 2014 09:00:52 +0000 (18:00 +0900)
commit	5ce621154de36571b71c02cb2e529cc0182b6013
tree	6c221b12fb280a6c6612c5922012de2038e75c6a	tree \| snapshot
parent	ba2500d8b946dd3896de8a5fde9c8c90321ce074	commit \| diff
parent	5e556e0dc08b16d6e996dacd28ce11410262c11e	commit \| diff

Merge branch 'da-timeline' into tizen

Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java

Change-Id: Id6f77b7640bf81dc1beb3ccc5a7c444fb0f0d452
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>

Domain: SDK / Dynamic Analysis;

RSS Atom

org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/DBColumn.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.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/ui/timeline/chart/EnergyChart.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java	diff1 \|	diff2 \|	blob \| history