aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-01-13 11:05:17 +0100
committerLukas Larsson <[email protected]>2014-01-13 11:05:17 +0100
commit589eba64f9c1fdef8a717c930aa8a51c47291a53 (patch)
tree08eb9195014b8b78a99b046a8f9bf71b1364933e /erts/emulator
parentdb00dc459af282b06469a2713b584cd65805e3a4 (diff)
parent9635f505739dd920d2b9297eb5e2d7f3b76518fa (diff)
downloadotp-589eba64f9c1fdef8a717c930aa8a51c47291a53.tar.gz
otp-589eba64f9c1fdef8a717c930aa8a51c47291a53.tar.bz2
otp-589eba64f9c1fdef8a717c930aa8a51c47291a53.zip
Merge branch 'lukas/erts/win-icon/OTP-11560'
* lukas/erts/win-icon/OTP-11560: erts: Update windows erlang icon
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions