jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

opps, cherry pick fix

Browse Source
This commit is contained in:
Jay Sorg 2014-05-19 22:41:42 -07:00
parent 123347cd5c
commit 0987feb42f
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xrdp/xrdp.c
View File

@ -435,13 +435,8 @@ main(int argc, char **argv)
{ {
g_writeln(""); g_writeln("");
g_writeln("xrdp: A Remote Desktop Protocol server."); g_writeln("xrdp: A Remote Desktop Protocol server.");
<<<<<<< HEAD
g_writeln("Copyright (C) Jay Sorg 2004-2013");
g_writeln("See http://xrdp.sourceforge.net for more information.");
=======
g_writeln("Copyright (C) Jay Sorg 2004-2014"); g_writeln("Copyright (C) Jay Sorg 2004-2014");
g_writeln("See http://www.xrdp.org for more information."); g_writeln("See http://www.xrdp.org for more information.");
>>>>>>> ec44b9d... xrdp: update web site
g_writeln(""); g_writeln("");
g_writeln("Usage: xrdp [options]"); g_writeln("Usage: xrdp [options]");
g_writeln(" --help: show help"); g_writeln(" --help: show help");
@ -458,13 +453,8 @@ main(int argc, char **argv)
{ {
g_writeln(""); g_writeln("");
g_writeln("xrdp: A Remote Desktop Protocol server."); g_writeln("xrdp: A Remote Desktop Protocol server.");
<<<<<<< HEAD
g_writeln("Copyright (C) Jay Sorg 2004-2013");
g_writeln("See http://xrdp.sourceforge.net for more information.");
=======
g_writeln("Copyright (C) Jay Sorg 2004-2014"); g_writeln("Copyright (C) Jay Sorg 2004-2014");
g_writeln("See http://www.xrdp.org for more information."); g_writeln("See http://www.xrdp.org for more information.");
>>>>>>> ec44b9d... xrdp: update web site
g_writeln("Version %s", PACKAGE_VERSION); g_writeln("Version %s", PACKAGE_VERSION);
g_writeln(""); g_writeln("");
g_deinit(); g_deinit();