aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap/lib/stdlib/ebin/stdlib.app
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2011-06-27 16:43:37 +0200
committerAnders Svensson <[email protected]>2011-06-27 16:43:37 +0200
commitbd6666300edb76e09c07508e3513f7bdde985b43 (patch)
tree1e735ae4a1ab2b63597f43ec342cefcd77513563 /bootstrap/lib/stdlib/ebin/stdlib.app
parent916e80959746c467ff858538e35f3c0105dbbced (diff)
parent1049243404cc52cad5ce1f1d2d37383a2ca06160 (diff)
downloadotp-bd6666300edb76e09c07508e3513f7bdde985b43.tar.gz
otp-bd6666300edb76e09c07508e3513f7bdde985b43.tar.bz2
otp-bd6666300edb76e09c07508e3513f7bdde985b43.zip
Merge remote branch 'upstream/dev' into dev
Diffstat (limited to 'bootstrap/lib/stdlib/ebin/stdlib.app')
-rw-r--r--bootstrap/lib/stdlib/ebin/stdlib.app2
1 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap/lib/stdlib/ebin/stdlib.app b/bootstrap/lib/stdlib/ebin/stdlib.app
index ac8b4ec113..bcce209e27 100644
--- a/bootstrap/lib/stdlib/ebin/stdlib.app
+++ b/bootstrap/lib/stdlib/ebin/stdlib.app
@@ -2,7 +2,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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