summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Gustafsson <fredrik@erlang.org>2013-02-28 09:39:41 +0100
committerFredrik Gustafsson <fredrik@erlang.org>2013-02-28 09:39:41 +0100
commit74cc492df29dd2fb501c095ee8b069f8b9675c94 (patch)
treea91cb9bcc0dfdc415ac410fa44f44392c78a630e
parent68dfee123c5857652e0a5fb3139da86fc6610d67 (diff)
parent30c33d5ff0c41e803c991e1b18051ac51f634444 (diff)
downloaderlang-74cc492df29dd2fb501c095ee8b069f8b9675c94.tar.gz
Merge branch 'dg/win_icon' into master-pu
-rw-r--r--erts/etc/win32/erlang.icobin1398 -> 49853 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/erts/etc/win32/erlang.ico b/erts/etc/win32/erlang.ico
index cee8b58af9..92857c507a 100644
--- a/erts/etc/win32/erlang.ico
+++ b/erts/etc/win32/erlang.ico
Binary files differ