aboutsummaryrefslogtreecommitdiffstats
path: root/lib/jinterface
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2013-04-05 18:51:50 +0200
committerPatrik Nyblom <[email protected]>2013-04-05 18:51:50 +0200
commitb9ef8bac23fa0421765afe3073f430a1f0d92260 (patch)
tree94428e0a154e4c7c835d56b92fb0e42eda19b12c /lib/jinterface
parentb269e15eea9232205a371d6b10c50628d836b661 (diff)
parent7b31cdb80624567568474d79bff07e053457a450 (diff)
downloadotp-b9ef8bac23fa0421765afe3073f430a1f0d92260.tar.gz
otp-b9ef8bac23fa0421765afe3073f430a1f0d92260.tar.bz2
otp-b9ef8bac23fa0421765afe3073f430a1f0d92260.zip
Merge branch 'maint-r16' into maint
Conflicts: erts/vsn.mk
Diffstat (limited to 'lib/jinterface')
0 files changed, 0 insertions, 0 deletions