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/src/Makefile | |
| 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/src/Makefile')
| -rw-r--r-- | lib/diameter/src/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile index c0cf418f06..578bbaee2e 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile @@ -1,19 +1,19 @@ -# +# # %CopyrightBegin% -# +# # 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 # 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% include $(ERL_TOP)/make/target.mk |