aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-10-08 15:22:38 +0200
committerHenrik Nord <[email protected]>2012-10-08 15:23:40 +0200
commit8ddf70f4a63a143dacfb572e78227f93f7143b35 (patch)
tree4062497064608524e619288bb231d6828ed0b04f
parentaead007ef22abb50d8cfbd0a58eb9f41fbb2f363 (diff)
parent589e047e5558d965ca48f96eda3cd452b0627df2 (diff)
downloadotp-8ddf70f4a63a143dacfb572e78227f93f7143b35.tar.gz
otp-8ddf70f4a63a143dacfb572e78227f93f7143b35.tar.bz2
otp-8ddf70f4a63a143dacfb572e78227f93f7143b35.zip
Merge branch 'jn/ets-match-pattern-export-type'
* jn/ets-match-pattern-export-type: Export ets:match_pattern/0 type Conflicts: lib/stdlib/src/ets.erl OTP-10472
-rw-r--r--lib/stdlib/src/ets.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl
index ee6cff1b75..61bb038737 100644
--- a/lib/stdlib/src/ets.erl
+++ b/lib/stdlib/src/ets.erl
@@ -42,7 +42,7 @@
-export([i/0, i/1, i/2, i/3]).
--export_type([tab/0, tid/0, match_spec/0, comp_match_spec/0]).
+-export_type([tab/0, tid/0, match_spec/0, comp_match_spec/0, match_pattern/0]).
%%-----------------------------------------------------------------------------