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

Merge branch 'tizen' into da-leak

Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/FreeDataDBTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataDBTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/MemoryAllocationDataDBTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java

Change-Id: I2f7f70788cab8d5b15542d5f30f9bc572abe5455
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>

author	seokgil.kang <seokgil.kang@samsung.com>
	Wed, 25 Feb 2015 06:27:31 +0000 (15:27 +0900)
committer	seokgil.kang <seokgil.kang@samsung.com>
	Wed, 25 Feb 2015 06:27:31 +0000 (15:27 +0900)
commit	f285c1622b75c0732f0b836878216f75728663b6
tree	d2c0d58ac0e52e0756f22ec004885f8ab319f916	tree \| snapshot
parent	7df7b331b4fa2e59357ecba3e3d6f3b7573ccde4	commit \| diff
parent	12b6b66f2d1a12660b365c76a54efd53884ac182	commit \| diff

org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.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/ui/range/RangeDataManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java	diff1 \|	diff2 \|	blob \| history