aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-08-29 17:25:25 +0200
committerHenrik Nord <[email protected]>2011-08-29 17:25:25 +0200
commit1a2fbf178614f752f04fd5c7499bb659293adf10 (patch)
tree32243efc57c967e31f3f2b239a70bb1e827cdd4b /lib/stdlib/src
parentb9ef73203a1b7f1400dc6d302827d7d732bab3f4 (diff)
parent7f5f7b08a8f0ed55126192beaed9d748f14c8f0a (diff)
downloadotp-1a2fbf178614f752f04fd5c7499bb659293adf10.tar.gz
otp-1a2fbf178614f752f04fd5c7499bb659293adf10.tar.bz2
otp-1a2fbf178614f752f04fd5c7499bb659293adf10.zip
Merge branch 'dev' into major
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/proplists.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/stdlib/src/proplists.erl b/lib/stdlib/src/proplists.erl
index 68697d0da2..e3eda5d932 100644
--- a/lib/stdlib/src/proplists.erl
+++ b/lib/stdlib/src/proplists.erl
@@ -49,9 +49,10 @@
%% ---------------------------------------------------------------------
--export_type([property/0]).
+-export_type([property/0, proplist/0]).
-type property() :: atom() | tuple().
+-type proplist() :: [property()].
%% ---------------------------------------------------------------------