summaryrefslogtreecommitdiff
path: root/csharp/src
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2015-12-17 11:45:27 -0800
committerMark Spruiell <mes@zeroc.com>2015-12-17 11:45:27 -0800
commit884e2be89b0cd997f372c59f05bf05a9a5372b60 (patch)
tree53d2123abf22042f827d0e83b6093cea038c3b3a /csharp/src
parentMerge branch '3.6' (diff)
downloadice-884e2be89b0cd997f372c59f05bf05a9a5372b60.tar.bz2
ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.tar.xz
ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.zip
Fixes for Bluetooth plug-ins.
Updates to testsuite to support Bluetooth and remote servers.
Diffstat (limited to 'csharp/src')
-rw-r--r--csharp/src/Ice/PropertyNames.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/csharp/src/Ice/PropertyNames.cs b/csharp/src/Ice/PropertyNames.cs
index 2f0d8797791..36655fb0e34 100644
--- a/csharp/src/Ice/PropertyNames.cs
+++ b/csharp/src/Ice/PropertyNames.cs
@@ -6,7 +6,7 @@
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Nov 9 08:34:24 2015
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Nov 24 08:50:30 2015
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -1021,7 +1021,6 @@ namespace IceInternal
public static Property[] IceBTProps =
{
- new Property(@"^IceBT\.DefaultAddress$", false, null),
new Property(@"^IceBT\.RcvSize$", false, null),
new Property(@"^IceBT\.SndSize$", false, null),
null