diff options
| author | Jose <jose@zeroc.com> | 2016-07-06 12:43:24 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-07-06 12:43:24 +0200 |
| commit | 313197e14eaed6395f99c6a75467814f2465b8f2 (patch) | |
| tree | 5c8b58e874020e948d4f12189d150fe2cac575b7 /java | |
| parent | OpenSSL-1.1.0-pre5 support (diff) | |
| parent | Remove IceSSL.SecurityLevel property (diff) | |
| download | ice-313197e14eaed6395f99c6a75467814f2465b8f2.tar.bz2 ice-313197e14eaed6395f99c6a75467814f2465b8f2.tar.xz ice-313197e14eaed6395f99c6a75467814f2465b8f2.zip | |
Merge remote-tracking branch 'origin/3.6-stretch' into 3.6
Conflicts:
cpp/src/Ice/PropertyNames.cpp
cpp/src/Ice/PropertyNames.h
cpp/test/IceSSL/configuration/AllTests.cpp
csharp/src/Ice/PropertyNames.cs
java/src/Ice/src/main/java/IceInternal/PropertyNames.java
js/src/Ice/PropertyNames.js
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/Ice/src/main/java/IceInternal/PropertyNames.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java index 92fc0f48027..838d58f06db 100644 --- a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java +++ b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul 1 19:08:40 2016 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Jul 6 12:39:37 2016 // IMPORTANT: Do not edit this file -- any edits made here will be lost! |