aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/doc/src/Makefile
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-06-11 12:20:12 +0200
committerAnders Svensson <[email protected]>2013-06-11 12:20:12 +0200
commit47e81de2e656767fbd3bc4b6f5d73631dcc3bb92 (patch)
treebdfb75f75229d18a618efac9867abcc0fb89dfff /lib/diameter/doc/src/Makefile
parent69694acdab4391ef3a10c1e9d8130a1cf39beb4a (diff)
parentb7ac5c3e23b47ef7dcb7e232b610d227df47dae3 (diff)
downloadotp-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/Makefile')
-rw-r--r--lib/diameter/doc/src/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/doc/src/Makefile b/lib/diameter/doc/src/Makefile
index 99a6680f12..bd2b6b103a 100644
--- a/lib/diameter/doc/src/Makefile
+++ b/lib/diameter/doc/src/Makefile
@@ -1,4 +1,4 @@
-#
+#
# %CopyrightBegin%
#
# Copyright Ericsson AB 2010-2013. All Rights Reserved.
@@ -117,7 +117,7 @@ info:
# ----------------------------------------------------
# Release Target
-# ----------------------------------------------------
+# ----------------------------------------------------
include $(ERL_TOP)/make/otp_release_targets.mk