aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/vsn.mk
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-09-01 15:30:49 +0200
committerRickard Green <[email protected]>2016-09-01 15:30:49 +0200
commit068185ef518384c0141cc643820f3a2a103ff4c3 (patch)
tree6b481e9de868bb3292906852c7426d498b55bbb4 /lib/ssh/vsn.mk
parentb4a93a0fc6d01cf2682652f7be16e020bdb10e3e (diff)
parentb022c5a175c528ebb66df129ddaa9f2d0b20a923 (diff)
downloadotp-068185ef518384c0141cc643820f3a2a103ff4c3.tar.gz
otp-068185ef518384c0141cc643820f3a2a103ff4c3.tar.bz2
otp-068185ef518384c0141cc643820f3a2a103ff4c3.zip
Merge branch 'rickard/new-purge-strategy/OTP-13833' into maint
* rickard/new-purge-strategy/OTP-13833: Fix reclaim of literal areas Conflicts: erts/emulator/beam/beam_bif_load.c
Diffstat (limited to 'lib/ssh/vsn.mk')
0 files changed, 0 insertions, 0 deletions