aboutsummaryrefslogtreecommitdiffstats
path: root/otp_build
diff options
context:
space:
mode:
authorZandra <[email protected]>2016-02-02 11:35:58 +0100
committerZandra <[email protected]>2016-02-02 11:35:58 +0100
commit1a1eaec544987f439061622f0177e424dfd6306a (patch)
tree05454189fc353121a038027255a6559e7bd2eaa2 /otp_build
parentb937e14a5b656b025f9b369656bfd03dadd481b5 (diff)
parent61ef7511c5ffae0b061d7cc45e9d564b02b891db (diff)
downloadotp-1a1eaec544987f439061622f0177e424dfd6306a.tar.gz
otp-1a1eaec544987f439061622f0177e424dfd6306a.tar.bz2
otp-1a1eaec544987f439061622f0177e424dfd6306a.zip
Merge branch 'maint'
Conflicts: erts/emulator/beam/beam_emu.c
Diffstat (limited to 'otp_build')
0 files changed, 0 insertions, 0 deletions