Merge branch 'da-database' into tizen
authorgreatim <jaewon81.lim@samsung.com>
Mon, 13 Jul 2015 08:09:35 +0000 (17:09 +0900)
committergreatim <jaewon81.lim@samsung.com>
Mon, 13 Jul 2015 08:09:35 +0000 (17:09 +0900)
commit70bc8dd85124ea2136d43e0ccbd9a0208942c95e
tree4d7e713555cd921073d469f156194114a8500fd3
parent98494ea5ba62d0b7bf30ce55ad196fc1660b6d36
parent5004b5bc92280fb795627015034fc57eb06d4f93
Merge branch 'da-database' into tizen

Signed-off-by: greatim <jaewon81.lim@samsung.com>
Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java

Change-Id: Idb65db63ba60e696eabad049de4ccc056f0e9c4f
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/interactive/data/InteractiveDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java