From a501bd59a7e3dfa027b713ba253427bf4600ed5f Mon Sep 17 00:00:00 2001
From: kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Mon, 10 Nov 2008 13:31:16 +0000
Subject: - update H.245 to v14 (06/2008) - use #.MODULE_EXPORT to avoid
 conflict between TransportAddress from H.225 and H.245 - regenerate H.323
 family dissectors

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26739 f5534014-38df-0310-8fa8-9805f1628bb7
---
 asn1/h225/h225.cnf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'asn1/h225')

diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf
index 448764e930..2a645dcf80 100644
--- a/asn1/h225/h225.cnf
+++ b/asn1/h225/h225.cnf
@@ -5,11 +5,11 @@
 
 #.IMPORT ../h235/h235-exp.cnf
 
-#.TYPE_ATTR
-# override TransportAddress from H.245
-# temporary solution till collision between imported and defined type is solved in the asn2wrs
-TransportAddress         TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(h225_TransportAddress_vals)  BITMASK = 0
-#.END
+
+
+
+
+
 #.IMPORT ../h245/h245-exp.cnf
 
 #----------------------------------------------------------------------------------------
@@ -27,7 +27,7 @@ AdmissionRejectReason
 LocationRejectReason	
 RegistrationRejectReason
 
-#.EXPORTS
+#.MODULE_EXPORTS
 RasMessage  WS_VAR
 NonStandardParameter
 PublicTypeOfNumber
-- 
cgit v1.2.3