aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2019-01-25 13:25:09 +0100
committerLukas Larsson <[email protected]>2019-01-25 13:25:09 +0100
commitd6d493ab1d9131e5a5ccb6a73cd65da39447ebf0 (patch)
treeb2283b4bc597ea93ecf41dc8b8ecdca905783f2c /make
parent5ed2f3d9757c9f2b8e49a4796e2a384c938d80dd (diff)
parentecbfc52f06a71ed553a5986c6a13bc893586615b (diff)
downloadotp-d6d493ab1d9131e5a5ccb6a73cd65da39447ebf0.tar.gz
otp-d6d493ab1d9131e5a5ccb6a73cd65da39447ebf0.tar.bz2
otp-d6d493ab1d9131e5a5ccb6a73cd65da39447ebf0.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release Include erlang-logo128.png in release Enable setting custom application icon for Mac OS X through environment variable Update to icon with better resolution
Diffstat (limited to 'make')
-rw-r--r--make/otp_version_tickets_in_merge0
1 files changed, 0 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/make/otp_version_tickets_in_merge