summaryrefslogtreecommitdiff
path: root/channels/h323/cisco-h225.asn
diff options
context:
space:
mode:
authorPaul Cadach <paul@odt.east.telecom.kz>2006-09-28 11:12:58 +0000
committerPaul Cadach <paul@odt.east.telecom.kz>2006-09-28 11:12:58 +0000
commit47a0e0807c48ddd553c9e5d160f424fefcbe784d (patch)
tree38b7f6cea9e73b4f59b365fe39b310007b8078ca /channels/h323/cisco-h225.asn
parent9cf1f14ed59be92cf9bb12003441306345885600 (diff)
Merged revisions 43635,43843-43844,43846 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r43635 | pcadach | 2006-09-26 03:26:12 +0600 (Втр, 26 Сен 2006) | 1 line Fix ASN1 description of non-standard Cisco extensions ........ r43843 | pcadach | 2006-09-28 12:01:37 +0600 (Чтв, 28 Сен 2006) | 1 line Don't treat unknown control frames as voice ........ r43844 | pcadach | 2006-09-28 12:02:45 +0600 (Чтв, 28 Сен 2006) | 1 line Don't warn on HOLD/UNHOLD control frames ........ r43846 | pcadach | 2006-09-28 16:51:21 +0600 (Чтв, 28 Сен 2006) | 1 line Do not open transmit channel until TCS is received ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/h323/cisco-h225.asn')
-rw-r--r--channels/h323/cisco-h225.asn2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/h323/cisco-h225.asn b/channels/h323/cisco-h225.asn
index c0eaeb623..1372e67d5 100644
--- a/channels/h323/cisco-h225.asn
+++ b/channels/h323/cisco-h225.asn
@@ -7,8 +7,8 @@ H323_UU_NonStdInfo ::= SEQUENCE
protoParam ProtoParam OPTIONAL,
commonParam CommonParam OPTIONAL,
...,
- progIndParam ProgIndParam OPTIONAL,
dummy1 OCTET STRING OPTIONAL,
+ progIndParam ProgIndParam OPTIONAL,
callMgrParam CallMgrParam OPTIONAL,
callSignallingParam CallSignallingParam OPTIONAL,
dummy2 OCTET STRING OPTIONAL,