diff options
| author | Jose <jose@zeroc.com> | 2016-07-06 13:15:32 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-07-06 13:15:32 +0200 |
| commit | fdba901305866d4c7d8d900e77a0870406c80aad (patch) | |
| tree | c8e7f26b00db7628d0bf06f5f4bd68b373f2361e /cpp/src/Ice/PropertyNames.h | |
| parent | MSbuild missing files (diff) | |
| parent | Remove IceSSL.SecurityLevel reintroduced with 3.6-stretch merge (diff) | |
| download | ice-fdba901305866d4c7d8d900e77a0870406c80aad.tar.bz2 ice-fdba901305866d4c7d8d900e77a0870406c80aad.tar.xz ice-fdba901305866d4c7d8d900e77a0870406c80aad.zip | |
Merge remote-tracking branch 'origin/3.6'
Conflicts:
cpp/src/Ice/PropertyNames.cpp
cpp/src/Ice/PropertyNames.h
cpp/test/IceSSL/configuration/Makefile
csharp/src/Ice/PropertyNames.cs
java/src/Ice/src/main/java/IceInternal/PropertyNames.java
js/src/Ice/PropertyNames.js
Diffstat (limited to 'cpp/src/Ice/PropertyNames.h')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index f73b3a5192b..0e794e84607 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul 1 19:50:59 2016 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Jul 6 13:14:00 2016 // IMPORTANT: Do not edit this file -- any edits made here will be lost! |