diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-06-18 10:37:19 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-06-18 10:37:19 -0230 |
| commit | 8b3a150636f4fc9c802af99a54c8283dcd11e9dc (patch) | |
| tree | 0ff72a2b2080cf54ab81147544980e586edd9474 /cpp/src | |
| parent | http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2120 - deprecated *.Colloc... (diff) | |
| parent | For bug 1597. Removing generation of C# and Java Property classes used in Pro... (diff) | |
| download | ice-8b3a150636f4fc9c802af99a54c8283dcd11e9dc.tar.bz2 ice-8b3a150636f4fc9c802af99a54c8283dcd11e9dc.tar.xz ice-8b3a150636f4fc9c802af99a54c8283dcd11e9dc.zip | |
Fixed merge conflicts.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index ec934b0ebcc..a612d04748a 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** // -// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jun 15 13:54:13 2007 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Jun 18 10:35:47 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index ce6a9c72662..5fc15442d17 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -7,7 +7,7 @@ // // ********************************************************************** // -// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jun 15 13:54:13 2007 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Jun 18 10:35:47 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! |