projects / sdk / tools / dynamic-analyzer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f97f5e2 d70ced3)
Merge remote-tracking branch 'origin/tizen' into da-file 28/29528/1
authorhyeran74.kim <hyeran74.kim@samsung.com>
Wed, 29 Oct 2014 07:04:21 +0000 (16:04 +0900)
committerhyeran74.kim <hyeran74.kim@samsung.com>
Wed, 29 Oct 2014 07:04:21 +0000 (16:04 +0900)
commiteda2832b6684705eccd199bc3be3a5dd5d9cf5d5
treea08505624eb6bd750f3be70408c899f4d528b9d2tree | snapshot
parentf97f5e2b274d90618cc211ad4e268dbf6b709767commit | diff
parentd70ced3ac09602c2b2e5592b483e4c01e5062a38commit | diff
Merge remote-tracking branch 'origin/tizen' into da-file

Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java

Change-Id: I9c4cf085acc8d6b2bceedf60035f218bf91d33c7
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
12 files changed:
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ColorResources.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/constant/CommonConstants.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/ui/file/FileApiListTable.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChart.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartBoard.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.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/file/model/FileAccess.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java diff1 | diff2 | blob | history
Domain: SDK / Dynamic Analysis;