diff options
| author | Michi Henning <michi@zeroc.com> | 2007-11-05 23:48:51 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2007-11-05 23:48:51 +1000 |
| commit | ed2d219830a72554d2110e90bb79189f16e24cfa (patch) | |
| tree | 23dc22d4f5216f691e53b54b4a26b07c419ca594 /java/src | |
| parent | Bug 2522 for C++ and Java. (diff) | |
| parent | Fix VC60 compilation problems (diff) | |
| download | ice-ed2d219830a72554d2110e90bb79189f16e24cfa.tar.bz2 ice-ed2d219830a72554d2110e90bb79189f16e24cfa.tar.xz ice-ed2d219830a72554d2110e90bb79189f16e24cfa.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceInternal/PropertyNames.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java index 50a288ac18e..1476d65929d 100644 --- a/java/src/IceInternal/PropertyNames.java +++ b/java/src/IceInternal/PropertyNames.java @@ -7,7 +7,7 @@ // // ********************************************************************** // -// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Oct 12 15:45:46 2007 +// Generated by makeprops.py from file ..\config\PropertyNames.xml, Mon Oct 29 16:59:13 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -68,6 +68,7 @@ public final class PropertyNames new Property("Ice\\.Default\\.Router\\.CollocationOptimized", false, null), new Property("Ice\\.Default\\.Router\\.ThreadPerConnection", false, null), new Property("Ice\\.Default\\.Router", false, null), + new Property("Ice\\.EventLog\\.Source", false, null), new Property("Ice\\.GC\\.Interval", false, null), new Property("Ice\\.ImplicitContext", false, null), new Property("Ice\\.InitPlugins", false, null), |