aboutsummaryrefslogtreecommitdiffstats
path: root/prebuild.skip
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2017-02-08 11:36:41 +0100
committerRaimo Niskanen <[email protected]>2017-02-08 11:36:41 +0100
commit835f29dd5bf75a25138ac723ea8644c0b4fce80c (patch)
treea9c3c953b50b2cddd8acf2049f997d5784b1a09a /prebuild.skip
parenta7582454a5414232823587ee1ba58da55a87953d (diff)
parentc41a6e8a377534158b4fcaf07c5b260d80221dbd (diff)
downloadotp-835f29dd5bf75a25138ac723ea8644c0b4fce80c.tar.gz
otp-835f29dd5bf75a25138ac723ea8644c0b4fce80c.tar.bz2
otp-835f29dd5bf75a25138ac723ea8644c0b4fce80c.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'prebuild.skip')
0 files changed, 0 insertions, 0 deletions