diff options
| author | Vadim Troshchinskiy <vadim@troshchinskiy.com> | 2017-04-07 16:20:47 +0200 |
|---|---|---|
| committer | Vadim Troshchinskiy <vadim@troshchinskiy.com> | 2017-04-07 16:20:47 +0200 |
| commit | ab3974f22b213a64316bf4384c3fd6d92c005f58 (patch) | |
| tree | 98b15bc61600407f2d1c4e60a0e1cfc7c70ec1b2 /nxcomp/Loop.cpp | |
| parent | dcdbc102c1d1827fd10959148d52f9e2e96bf3cd (diff) | |
| parent | 4c2fe0d97f03e8f325bc63bbacda257f804fae7d (diff) | |
| download | nx-libs-ab3974f22b213a64316bf4384c3fd6d92c005f58.tar.gz nx-libs-ab3974f22b213a64316bf4384c3fd6d92c005f58.tar.bz2 nx-libs-ab3974f22b213a64316bf4384c3fd6d92c005f58.zip | |
Merge remote-tracking branch 'sunweaver-pr/pr/nxproxy-read-from-stdin' into 3.6.x
Diffstat (limited to 'nxcomp/Loop.cpp')
| -rw-r--r-- | nxcomp/Loop.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp index a3ea11009..7aaff09e8 100644 --- a/nxcomp/Loop.cpp +++ b/nxcomp/Loop.cpp @@ -13940,7 +13940,7 @@ void PrintProcessInfo() // cerr << "Info: Proxy running in " - << (control -> ProxyMode == proxy_client ? "server" : "client") + << (control -> ProxyMode == proxy_client ? "client" : "server") << " mode with pid '" << getpid() << "'.\n"; if (agent == NULL) |