aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2010-09-01 15:13:37 +0200
committerBjörn Gustavsson <[email protected]>2010-09-01 15:13:37 +0200
commitca9ab3d500ddae0c08dca4d389a975f020fbddcc (patch)
treee440d022e200742c1bfa93bf947dcf4c70b2dd0a /lib/kernel
parent40436debcac9645817c4799fe27d32b6bfa8fddd (diff)
parent76ac94968e28fb4b0dc38ed7062849efe61c50e6 (diff)
downloadotp-ca9ab3d500ddae0c08dca4d389a975f020fbddcc.tar.gz
otp-ca9ab3d500ddae0c08dca4d389a975f020fbddcc.tar.bz2
otp-ca9ab3d500ddae0c08dca4d389a975f020fbddcc.zip
Merge branch 'maint-r13' into dev
* maint-r13: Remove copyright headers in vsn.mk files Conflicts: lib/appmon/vsn.mk lib/erl_docgen/vsn.mk lib/inets/vsn.mk lib/kernel/vsn.mk lib/reltool/vsn.mk lib/ssl/vsn.mk lib/stdlib/vsn.mk lib/tools/vsn.mk lib/tv/vsn.mk lib/xmerl/vsn.mk
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/vsn.mk19
1 files changed, 0 insertions, 19 deletions
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 9a191f9aeb..651d082379 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1,20 +1 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2010. 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%
-#
-
KERNEL_VSN = 2.14.1