summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/PropertyNames.cpp
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2009-12-09 15:12:12 +1000
committerMichi Henning <michi@zeroc.com>2009-12-09 15:12:12 +1000
commitd0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678 (patch)
tree9524523d712bca42f6bd36fabd72c76371ecdca8 /cpp/src/Ice/PropertyNames.cpp
parentMerge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff)
parentfix for cpp/test/Ice/Makefile.mak (diff)
downloadice-d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678.tar.bz2
ice-d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678.tar.xz
ice-d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678.zip
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/Ice/PropertyNames.cpp')
-rw-r--r--cpp/src/Ice/PropertyNames.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index f32df36e64c..8006f446dad 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, Fri Dec 4 10:31:05 2009
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Dec 8 12:37:14 2009
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -230,6 +230,7 @@ const IceInternal::Property IceGridPropsData[] =
IceInternal::Property("IceGrid.Node.DisableOnFailure", false, 0),
IceInternal::Property("IceGrid.Node.Name", false, 0),
IceInternal::Property("IceGrid.Node.Output", false, 0),
+ IceInternal::Property("IceGrid.Node.ProcessorSocketCount", false, 0),
IceInternal::Property("IceGrid.Node.PrintServersReady", false, 0),
IceInternal::Property("IceGrid.Node.PropertiesOverride", false, 0),
IceInternal::Property("IceGrid.Node.RedirectErrToOut", false, 0),