aboutsummaryrefslogtreecommitdiffstats
path: root/xcomp/erl-xcomp.conf.template
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-08-31 14:59:43 +0200
committerBjörn-Egil Dahlberg <[email protected]>2012-08-31 14:59:43 +0200
commit91f8f903ae866d06332a6f2ef968b419339e6003 (patch)
tree6ab98b4cd60c4b73be8452619bae86cf90a79723 /xcomp/erl-xcomp.conf.template
parent87c5ea0577267fd17bcc572ab81bdac030dd8332 (diff)
parent2d03ab7ffde828d3b56f8b7738fd0c00d0f5b630 (diff)
downloadotp-91f8f903ae866d06332a6f2ef968b419339e6003.tar.gz
otp-91f8f903ae866d06332a6f2ef968b419339e6003.tar.bz2
otp-91f8f903ae866d06332a6f2ef968b419339e6003.zip
Merge branch 'maint'
Conflicts: lib/diameter/autoconf/vxworks/sed.general xcomp/README.md
Diffstat (limited to 'xcomp/erl-xcomp.conf.template')
-rw-r--r--xcomp/erl-xcomp.conf.template2
1 files changed, 1 insertions, 1 deletions
diff --git a/xcomp/erl-xcomp.conf.template b/xcomp/erl-xcomp.conf.template
index c215f0fb13..7d70332cef 100644
--- a/xcomp/erl-xcomp.conf.template
+++ b/xcomp/erl-xcomp.conf.template
@@ -2,7 +2,7 @@
##
## %CopyrightBegin%
##
-## Copyright Ericsson AB 2009-2010. All Rights Reserved.
+## Copyright Ericsson AB 2009-2012. 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