aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src/Makefile
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2017-09-18 15:21:01 +0200
committerAnders Svensson <[email protected]>2017-09-18 15:21:01 +0200
commitc504153dbb07bf756621cd21401e18d9055578ad (patch)
treed63b56bba18a3a629184e92e9eac2f85212f2174 /erts/preloaded/src/Makefile
parent445ed7f183e40186f44b0af3c4b19bd65262c9a0 (diff)
parent9cc95f49e6f106236a6ff3cbd184055d1dfd2fd4 (diff)
downloadotp-c504153dbb07bf756621cd21401e18d9055578ad.tar.gz
otp-c504153dbb07bf756621cd21401e18d9055578ad.tar.bz2
otp-c504153dbb07bf756621cd21401e18d9055578ad.zip
Merge branch 'anders/diameter/20.1/OTP-14561' into maint
* anders/diameter/20.1/OTP-14561: Update appup and version for 20.1
Diffstat (limited to 'erts/preloaded/src/Makefile')
0 files changed, 0 insertions, 0 deletions