Merge branch 'anders/diameter/dictionaries/OTP-9641'

* anders/diameter/dictionaries/OTP-9641:
  Add diameter_make as compilation interface
  Update documentation
  Don't require -i directory to exist
  Allow @inherits to be set/cleared with diameterc
  Allow @name/@prefix to be set with diameterc
  Dependency fix
  Move dictionaries into own directory and rename
  Whitespace fixes
  @result_code -> @define in dictionary files

1 files changed, 25 insertions, 0 deletions

diff --git a/lib/diameter/src/dict/relay.dia b/lib/diameter/src/dict/relay.dia
new file mode 100644
index 0000000000..c22293209b
--- /dev/null
+++ b/lib/diameter/src/dict/relay.dia
@@ -0,0 +1,25 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Ericsson AB 2010-2011. 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
+;; compliance with the License. You should have received a copy of the
+;; Erlang Public License along with this software. If not, it can be
+;; retrieved online at http://www.erlang.org/.
+;;
+;; Software distributed under the License is distributed on an "AS IS"
+;; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+;; the License for the specific language governing rights and limitations
+;; under the License.
+;;
+;; %CopyrightEnd%
+;;
+
+@id 0xFFFFFFFF
+@name   diameter_gen_relay
+@prefix diameter_relay
+@vendor 0 IETF
+
+@inherits diameter_gen_base_rfc3588