diff options
| author | Brent Eagles <brent@zeroc.com> | 2007-06-19 11:20:49 -0230 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2007-06-19 11:20:49 -0230 |
| commit | 1074eb3b852646474c46b56db01b87e1d8c020ce (patch) | |
| tree | 2c0ab4c6190c5e8e7924a8dff4703d647be64f3f /cpp/src/slice2java/Gen.cpp | |
| parent | Added support for SIGKILL/SIGTERM on Windows (bug 2258) (diff) | |
| parent | Removing unnecessary attribute. (diff) | |
| download | ice-1074eb3b852646474c46b56db01b87e1d8c020ce.tar.bz2 ice-1074eb3b852646474c46b56db01b87e1d8c020ce.tar.xz ice-1074eb3b852646474c46b56db01b87e1d8c020ce.zip | |
Merge branch 'property_names_enh'
Conflicts:
cpp/config/PropertyNames.xml
cpp/src/Ice/PropertyNames.cpp
cpp/src/Ice/PropertyNames.h
cs/src/Ice/PropertyNames.cs
java/src/IceInternal/PropertyNames.java
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
0 files changed, 0 insertions, 0 deletions