diff options
| author | Magnus Lidén <[email protected]> | 2013-12-09 14:50:34 +0100 |
|---|---|---|
| committer | Magnus Lidén <[email protected]> | 2013-12-09 14:50:34 +0100 |
| commit | ba05ec6dcbf26df15351eae0dc2055c9628b9706 (patch) | |
| tree | 4ee2839b42ecd2a837b1724b1cf908807b286b45 /make/otp_ded.mk.in | |
| parent | a10f7d4cd2a5a74fb55c9c135c6e9dcbfd2221e0 (diff) | |
| parent | 652d0d2d784afdb0d42502bdf2831776a0e52ad8 (diff) | |
| download | otp-ba05ec6dcbf26df15351eae0dc2055c9628b9706.tar.gz otp-ba05ec6dcbf26df15351eae0dc2055c9628b9706.tar.bz2 otp-ba05ec6dcbf26df15351eae0dc2055c9628b9706.zip | |
Merge branch 'siri/test-bugfix-upgrade-emulator' into maint
* siri/test-bugfix-upgrade-emulator:
[sasl] Test bugfix in branch 'schlagert/fix_emulator_upgrades'
Diffstat (limited to 'make/otp_ded.mk.in')
0 files changed, 0 insertions, 0 deletions