projects / sdk / tools / dynamic-analyzer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c7a36d4 f5fccb5)
SRADA-908: Merge remote-tracking branch 'origin/ui_e4_migration' into 'sdk_merge'
authorjaeyong lee <jae-yong.lee@samsung.com>
Thu, 14 Jul 2016 06:25:45 +0000 (15:25 +0900)
committerMaria Guseva <m.guseva@samsung.com>
Thu, 14 Jul 2016 09:46:26 +0000 (18:46 +0900)
commitcdaf05172cad9fbcd9be9ba619be11fb53516194
treea8fceea6d3b5ba5faab3a9dbc87aff16dfb527a9tree | snapshot
parentc7a36d44d47d08fcbdf0654b4429ca7adedcf956commit | diff
parentf5fccb5aa3c9abc69cdb880db727fdcb2250b10acommit | diff
SRADA-908: Merge remote-tracking branch 'origin/ui_e4_migration' into 'sdk_merge'

Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/MenuBar.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java

Change-Id: I9c779c07cf946a97962e8c7c90e94a60cb626ac8
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/GUIAction.java diff1 | | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.properties diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/hierarchy/tree/tool/HierarchyTreeExporter.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/MenuBar.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java diff1 | diff2 | blob | history
Domain: SDK / Dynamic Analysis;