aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-11-29 16:53:57 +0100
committerAnders Svensson <[email protected]>2013-11-29 16:53:57 +0100
commit8b7faf3fecf7a8204b0d941713150adca4d20a7d (patch)
tree15e90c7940d0831057d03983b8c1130ac1daaafc /erts
parent365daf1229e6aeaaab76aa1ddd9cfca27004d89a (diff)
parent8b82b718e7a02ef505d38f5b174b4213a0d5436a (diff)
downloadotp-8b7faf3fecf7a8204b0d941713150adca4d20a7d.tar.gz
otp-8b7faf3fecf7a8204b0d941713150adca4d20a7d.tar.bz2
otp-8b7faf3fecf7a8204b0d941713150adca4d20a7d.zip
Merge branch 'anders/diameter/capx_dictionary/OTP-11361' into maint
* anders/diameter/capx_dictionary/OTP-11361: Don't hardcode diameter_base @prefix on common dictionary
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions