diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-05-31 12:12:39 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-05-31 12:12:39 +0200 |
| commit | e3051f7a7fd2d128aa00007ef36f9d05cb645f1f (patch) | |
| tree | 7b9cc4491de36ea0a971b3dd3159ae6f2323bece | |
| parent | 4a9c1b9465f189a1477b1ecce7cdfacfd266cd65 (diff) | |
| parent | 36c3613a7af499eb4655e1aa37b04ec6602a2518 (diff) | |
| download | nx-libs-e3051f7a7fd2d128aa00007ef36f9d05cb645f1f.tar.gz nx-libs-e3051f7a7fd2d128aa00007ef36f9d05cb645f1f.tar.bz2 nx-libs-e3051f7a7fd2d128aa00007ef36f9d05cb645f1f.zip | |
Merge branch 'nitomartinez-3.6.x' into 3.6.x3713346f
| -rw-r--r-- | nxcomp/Control.cpp | 3 | ||||
| -rw-r--r-- | nxcomp/Loop.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/nxcomp/Control.cpp b/nxcomp/Control.cpp index 1bf2dbdd2..93b3ff277 100644 --- a/nxcomp/Control.cpp +++ b/nxcomp/Control.cpp @@ -618,7 +618,8 @@ Control::Control() #ifdef TEST *logofs << "Control: Major version is " << LocalVersionMajor << " minor is " << LocalVersionMinor << " patch is " - << LocalVersionPatch << ".\n" << logofs_flush; + << LocalVersionPatch << " Maintenance version is " + << LocalVersionMaintenancePatch << ".\n" << logofs_flush; #endif // diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp index 97020d162..436713761 100644 --- a/nxcomp/Loop.cpp +++ b/nxcomp/Loop.cpp @@ -7508,7 +7508,6 @@ int ReadProxyVersion(int fd) &(control -> RemoteVersionPatch)); } - #ifdef TEST *logofs << "Loop: Identified remote version '" << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor << "." << control -> RemoteVersionPatch << "'.\n" << logofs_flush; @@ -7520,7 +7519,6 @@ int ReadProxyVersion(int fd) *logofs << "Loop: Local version '" << control -> LocalVersionMajor << "." << control -> LocalVersionMinor << "." << control -> LocalVersionPatch << "'.\n" << logofs_flush; - #endif if (SetVersion() < 0) { |