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/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/Makefile')
| -rw-r--r-- | lib/diameter/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/diameter/Makefile b/lib/diameter/Makefile index 9961d627cf..aa1c9f7f20 100644 --- a/lib/diameter/Makefile +++ b/lib/diameter/Makefile @@ -1,7 +1,7 @@ -# +# # %CopyrightBegin% # -# Copyright Ericsson AB 2010-2012. 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 @@ -22,11 +22,11 @@ include vsn.mk include subdirs.mk SUB_DIRECTORIES = $(SUB_DIRS) doc/src -SPECIAL_TARGETS = +SPECIAL_TARGETS = include $(ERL_TOP)/make/otp_subdir.mk -info: +info: @echo "APP_VSN = $(APP_VSN)" .PHONY: info |