aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-10-02 13:07:50 +0200
committerHenrik Nord <[email protected]>2015-10-02 13:07:50 +0200
commit584027ceea20c6e65f4b712c29ad2ae89fca8fb0 (patch)
treeca22decce860929d92f6c5373c188aa3964dec33 /erts
parent212e71b7f19d9f024eb11b371d3ce1ece26a2c42 (diff)
parentb193b02b00f899791735586b31fc5cd1d7147c8b (diff)
downloadotp-584027ceea20c6e65f4b712c29ad2ae89fca8fb0.tar.gz
otp-584027ceea20c6e65f4b712c29ad2ae89fca8fb0.tar.bz2
otp-584027ceea20c6e65f4b712c29ad2ae89fca8fb0.zip
Merge branch 'travis-ci' into maint
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions