Merge remote-tracking branch 'origin/ui_e4_migration' into sdk_merge
authorGihun Chang <gihun.chang@samsung.com>
Fri, 1 Jul 2016 09:51:06 +0000 (18:51 +0900)
committerMaria Guseva <m.guseva@samsung.com>
Mon, 4 Jul 2016 13:31:27 +0000 (22:31 +0900)
Change-Id: If6764c8f26c818d500744209261c8b0d95376b05

1  2 
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FilePage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/MemoryPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/MenuBar.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java

@@@ -31,8 -33,8 +33,9 @@@ import org.eclipse.swt.SWT
  import org.eclipse.swt.custom.SashForm;
  import org.eclipse.swt.layout.FillLayout;
  import org.eclipse.swt.widgets.Composite;
+ import org.eclipse.swt.widgets.Sash;
  import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 +import org.tizen.dynamicanalyzer.common.Global;
  import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
  import org.tizen.dynamicanalyzer.resources.ColorResources;
  import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;