From 8cf78c4b3e4ec7525ddde4dc12d05efecdf713a2 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Fri, 8 Jul 2016 20:38:00 +0900 Subject: [PATCH] ui: remove local change that is applied upstream Change-Id: Ia9d027c2f4d28f8725601a94c55a90f658582538 Signed-off-by: SeokYeon Hwang --- ui/cocoa.m | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index abb0906..97426ba 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") || -- 2.7.4