diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-18 07:05:45 -0800 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-18 07:05:45 -0800 |
| commit | a135edb5f44ef42c9238ef4d58169485fd03060f (patch) | |
| tree | 77251b156f71d2af2f5f6f17c56634c812b52112 /cpp/src/Ice/PropertyNames.cpp | |
| parent | Improved EJB demo to test user exceptions (diff) | |
| parent | Changed Ice.UseServantClassLoader to Ice.UseApplicationClassLoader (diff) | |
| download | ice-a135edb5f44ef42c9238ef4d58169485fd03060f.tar.bz2 ice-a135edb5f44ef42c9238ef4d58169485fd03060f.tar.xz ice-a135edb5f44ef42c9238ef4d58169485fd03060f.zip | |
Merge branch 'master' of ssh://dev.vpn.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/Ice/PropertyNames.cpp')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 856149c1da0..6fe0c633e4e 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Nov 20 23:07:17 2012 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Jan 18 14:06:41 2013 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -140,6 +140,7 @@ const IceInternal::Property IcePropsData[] = IceInternal::Property("Ice.TCP.Backlog", false, 0), IceInternal::Property("Ice.TCP.RcvSize", false, 0), IceInternal::Property("Ice.TCP.SndSize", false, 0), + IceInternal::Property("Ice.UseUserClassLoader", false, 0), IceInternal::Property("Ice.UseSyslog", false, 0), IceInternal::Property("Ice.Warn.AMICallback", false, 0), IceInternal::Property("Ice.Warn.Connections", false, 0), |