diff options
| author | Anders Svensson <[email protected]> | 2013-06-11 12:20:12 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-06-11 12:20:12 +0200 |
| commit | 47e81de2e656767fbd3bc4b6f5d73631dcc3bb92 (patch) | |
| tree | bdfb75f75229d18a618efac9867abcc0fb89dfff /lib/diameter/doc/src/diameter_compile.xml | |
| parent | 69694acdab4391ef3a10c1e9d8130a1cf39beb4a (diff) | |
| parent | b7ac5c3e23b47ef7dcb7e232b610d227df47dae3 (diff) | |
| download | otp-47e81de2e656767fbd3bc4b6f5d73631dcc3bb92.tar.gz otp-47e81de2e656767fbd3bc4b6f5d73631dcc3bb92.tar.bz2 otp-47e81de2e656767fbd3bc4b6f5d73631dcc3bb92.zip | |
Merge branch 'anders/diameter/release/R16B01/OTP-11120' into maint
* anders/diameter/release/R16B01/OTP-11120:
vsn -> 1.4.2
Update appup for R16B01
Trailing whitespace and copyright fixes
Minor macro simplification
Move app/appsrc from src/base into src
Diffstat (limited to 'lib/diameter/doc/src/diameter_compile.xml')
| -rw-r--r-- | lib/diameter/doc/src/diameter_compile.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/diameter/doc/src/diameter_compile.xml b/lib/diameter/doc/src/diameter_compile.xml index fc81e4efed..6630019e5c 100644 --- a/lib/diameter/doc/src/diameter_compile.xml +++ b/lib/diameter/doc/src/diameter_compile.xml @@ -16,9 +16,9 @@ </copyright> <legalnotice> -The program may be used and/or copied only with the written permission -from Ericsson AB, or in accordance with the terms and conditions -stipulated in the agreement/contract under which the program has been +The program may be used and/or copied only with the written permission +from Ericsson AB, or in accordance with the terms and conditions +stipulated in the agreement/contract under which the program has been supplied. </legalnotice> |