projects / sdk / tools / dynamic-analyzer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 61f2210 4d9c02b)
Merge remote-tracking branch 'origin/tizen' into da-setting 92/28192/1
authorheeyoung <heeyoung1008.hwang@samsung.com>
Tue, 30 Sep 2014 05:24:26 +0000 (14:24 +0900)
committerheeyoung <heeyoung1008.hwang@samsung.com>
Tue, 30 Sep 2014 05:24:26 +0000 (14:24 +0900)
commit7760f5a65967dbdb6742ee50924ab71e02d79e91
treeaa60e64bb974f1e35322fa69d1f10ec85bf1bdbatree | snapshot
parent61f2210c39a00c6eae3d8f4a77068e278242d964commit | diff
parent4d9c02b480608a65fc697156b86357eadebb90bfcommit | diff
Merge remote-tracking branch 'origin/tizen' into da-setting

Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTreeTableToggleRenderer.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogTemplatePage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/WelcomeDialog.java

Change-Id: I11e5919ded8bab8523ab21f5fc12db0432e42963
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties 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/summary/leaks/NewLeakDetector.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.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/SettingDialog.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/WelcomeDialog.java diff1 | diff2 | blob | history
Domain: SDK / Dynamic Analysis;