aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_interface/src/registry
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-10-06 11:03:55 +0200
committerHenrik Nord <[email protected]>2015-10-06 11:03:55 +0200
commitb99010e5f188097fd9a83204ac6ce2dcd048e640 (patch)
tree2b789952bc80fd1585dde569116cc604f9962ab7 /lib/erl_interface/src/registry
parent7283245d4a3fd6b59f0b0f2748cad5c61733622d (diff)
parent4f9905824002bebc33c2914669b4c364927cb0ee (diff)
downloadotp-b99010e5f188097fd9a83204ac6ce2dcd048e640.tar.gz
otp-b99010e5f188097fd9a83204ac6ce2dcd048e640.tar.bz2
otp-b99010e5f188097fd9a83204ac6ce2dcd048e640.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'lib/erl_interface/src/registry')
0 files changed, 0 insertions, 0 deletions