diff options
author | Lukas Larsson <[email protected]> | 2017-08-23 13:22:17 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2017-08-23 13:22:17 +0200 |
commit | 9513aed6c04c34f06bd594b771ee9471a5264ac0 (patch) | |
tree | 1b20d19d8b032c775caff973199793284e2b3997 /erts/vsn.mk | |
parent | 6016375096c293925c42d73cbbb72e29e5c38131 (diff) | |
parent | 203b66236c5c2c9a2ce81b5998f01e24706984ec (diff) | |
download | otp-9513aed6c04c34f06bd594b771ee9471a5264ac0.tar.gz otp-9513aed6c04c34f06bd594b771ee9471a5264ac0.tar.bz2 otp-9513aed6c04c34f06bd594b771ee9471a5264ac0.zip |
Merge branch 'lukas/erts/fix_dirty_trace_message_flush/OTP-14538'
* lukas/erts/fix_dirty_trace_message_flush/OTP-14538:
erts: Fix incorrect merge of dirty_trace_message_flush fix to master
Diffstat (limited to 'erts/vsn.mk')
0 files changed, 0 insertions, 0 deletions