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 /scripts/TestUtil.py | |
| 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 'scripts/TestUtil.py')
0 files changed, 0 insertions, 0 deletions