diff options
| author | Anders Svensson <[email protected]> | 2013-12-02 09:45:00 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-12-02 09:45:00 +0100 |
| commit | 22ae0b2bd6fbe973915b19551c7d6a397a8c8a60 (patch) | |
| tree | 58ced6a6e5e434741a2bfcae26d246206e3f4d7b /lib/diameter/examples/dict/rfc4740_sip.dia | |
| parent | 0f2458596200b5567b06c626254e2c3477ccfabf (diff) | |
| parent | 5994bd25093d42be188564eda2e22c05aa9ad486 (diff) | |
| download | otp-22ae0b2bd6fbe973915b19551c7d6a397a8c8a60.tar.gz otp-22ae0b2bd6fbe973915b19551c7d6a397a8c8a60.tar.bz2 otp-22ae0b2bd6fbe973915b19551c7d6a397a8c8a60.zip | |
Merge branch 'anders/diameter/R16B03_release/OTP-11499' into maint
* anders/diameter/R16B03_release/OTP-11499:
vsn -> 1.5
Update appup for OTP-11168
Update appup for OTP-11361
Add makefile to build example dictionaries
Add recent Diameter-related RFCs
Generate diameterc.1, not diameter_compile.1
Fix documentation typos
Fix appup blunder
Diffstat (limited to 'lib/diameter/examples/dict/rfc4740_sip.dia')
| -rw-r--r-- | lib/diameter/examples/dict/rfc4740_sip.dia | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/examples/dict/rfc4740_sip.dia b/lib/diameter/examples/dict/rfc4740_sip.dia index 8c21882649..cada3ac826 100644 --- a/lib/diameter/examples/dict/rfc4740_sip.dia +++ b/lib/diameter/examples/dict/rfc4740_sip.dia @@ -1,7 +1,7 @@ ;; ;; %CopyrightBegin% ;; -;; Copyright Ericsson AB 2010-2011. All Rights Reserved. +;; Copyright Ericsson AB 2010-2013. All Rights Reserved. ;; ;; The contents of this file are subject to the Erlang Public License, ;; Version 1.1, (the "License"); you may not use this file except in @@ -23,7 +23,7 @@ @id 6 -@inherits rfc3588_base +@inherits common @inherits rfc4590_digest ;; =========================================================================== |