aboutsummaryrefslogtreecommitdiffstats
path: root/lib/jinterface/doc/src
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-02-14 11:52:20 +0100
committerBjörn-Egil Dahlberg <[email protected]>2014-02-14 11:52:20 +0100
commit754d1e649f41f399d52c7b2d0eface0308d7d3b8 (patch)
tree6a113851abd53db6c402b2cabebf252705fbd3e3 /lib/jinterface/doc/src
parent9f698ad63586735de169fb514f22eea5164e173b (diff)
parenta2d09eb344a6ec0901aee103abf290a143f004ad (diff)
downloadotp-754d1e649f41f399d52c7b2d0eface0308d7d3b8.tar.gz
otp-754d1e649f41f399d52c7b2d0eface0308d7d3b8.tar.bz2
otp-754d1e649f41f399d52c7b2d0eface0308d7d3b8.zip
Merge branch 'vlad/maps-jinterface/OTP-11703'
* vlad/maps-jinterface/OTP-11703: jinterface: Fix jinterface_SUITE jinterface: update user's guide with maps jinterface: implement support for maps
Diffstat (limited to 'lib/jinterface/doc/src')
-rw-r--r--lib/jinterface/doc/src/jinterface_users_guide.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/jinterface/doc/src/jinterface_users_guide.xml b/lib/jinterface/doc/src/jinterface_users_guide.xml
index aaf84e2e3d..5dfe5c0c6d 100644
--- a/lib/jinterface/doc/src/jinterface_users_guide.xml
+++ b/lib/jinterface/doc/src/jinterface_users_guide.xml
@@ -112,6 +112,10 @@
<cell align="left" valign="middle"><seealso marker="java/com/ericsson/otp/erlang/OtpErlangTuple">OtpErlangTuple</seealso></cell>
</row>
<row>
+ <cell align="left" valign="middle">map</cell>
+ <cell align="left" valign="middle"><seealso marker="java/com/ericsson/otp/erlang/OtpErlangMap">OtpErlangMap</seealso></cell>
+ </row>
+ <row>
<cell align="left" valign="middle">term</cell>
<cell align="left" valign="middle"><seealso marker="java/com/ericsson/otp/erlang/OtpErlangObject">OtpErlangObject</seealso></cell>
</row>