From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Fri, 8 Jul 2016 11:38:00 +0000 (+0900)
Subject: ui: remove local change that is applied upstream
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~34^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8cf78c4b3e4ec7525ddde4dc12d05efecdf713a2;p=sdk%2Femulator%2Fqemu.git

ui: remove local change that is applied upstream

Change-Id: Ia9d027c2f4d28f8725601a94c55a90f658582538
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---

diff --git a/ui/cocoa.m b/ui/cocoa.m
index abb0906e4c..97426ba09d 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -1170,11 +1170,6 @@ int main (int argc, const char * argv[]) {
                 opt++;
             }
             if (!strcmp(opt, "-h") || !strcmp(opt, "-help") ||
-#ifdef CONFIG_MARU
-                // XXX: we assume that a user do not want to use cocoa UI
-                // if -display is specified
-                !strcmp(opt, "-display") ||
-#endif
                 !strcmp(opt, "-vnc") ||
                 !strcmp(opt, "-nographic") ||
                 !strcmp(opt, "-version") ||