diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-02-27 04:08:51 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-27 04:08:51 +0100 |
commit | 0a5d26d121a8420feb25bd68c8f1623edf50e0a8 (patch) | |
tree | 104d1f0ff7e856a3c2e54433046e52346e80d356 /nx-X11/programs/Xserver/os/utils.c | |
parent | e1f2902bb1ad29f852f97dc08a3e3e29ad88c384 (diff) | |
parent | fff875549f70b5f16f9e15cb8fdb4022939bf806 (diff) | |
download | nx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.tar.gz nx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.tar.bz2 nx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.zip |
Merge branch 'sunweaver-pr/hard-code-rgb-colors' into 3.6.x
Attributes GH PR #319: https://github.com/ArcticaProject/nx-libs/pull/319
Diffstat (limited to 'nx-X11/programs/Xserver/os/utils.c')
-rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 204494d63..af793454f 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -565,7 +565,6 @@ void UseMsg(void) ErrorF("-c turns off key-click\n"); ErrorF("c # key-click volume (0-100)\n"); ErrorF("-cc int default color visual class\n"); - ErrorF("-co file color database file\n"); #ifdef COMMANDLINE_CHALLENGED_OPERATING_SYSTEMS ErrorF("-config file read options from file\n"); #endif @@ -771,13 +770,6 @@ ProcessCommandLine(int argc, char *argv[]) else UseMsg(); } - else if ( strcmp( argv[i], "-co") == 0) - { - if(++i < argc) - rgbPath = argv[i]; - else - UseMsg(); - } else if ( strcmp( argv[i], "-core") == 0) CoreDump = TRUE; else if ( strcmp( argv[i], "-dpi") == 0) |