aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/atom.names
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <egil@erlang.org>2012-03-30 14:53:37 +0200
committerBjörn-Egil Dahlberg <egil@erlang.org>2012-03-30 14:53:37 +0200
commit4ba372e01009c36a9fea40a5d8b3c8e85284d102 (patch)
tree488a6c5701f57793fb852a40733dfbe68aabe920 /erts/emulator/beam/atom.names
parent9af01a23d3bf18366d3d2246ee0e9bf03f6dcfc1 (diff)
parentce4431b33d18c04f4166def737b2aed582e4426a (diff)
downloadotp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.gz
otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.bz2
otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/atom.names')
-rw-r--r--erts/emulator/beam/atom.names2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index 32b91ef02a..78c566ed38 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 1996-2011. All Rights Reserved.
+# Copyright Ericsson AB 1996-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