aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-11-10 11:46:02 +0100
committerHenrik Nord <[email protected]>2011-11-10 11:46:06 +0100
commit9f9e948af31f6f313702bf83c31ec636ca7ca4fc (patch)
tree519bdf6b6c53f3919f5a56853d867ce7e8f4de9a /erts
parent4e56fa97da6881458f3fef2b9a8756f45d54f3ec (diff)
parented32c91e80e17628df5e712e7c644d3d94a9bd85 (diff)
downloadotp-9f9e948af31f6f313702bf83c31ec636ca7ca4fc.tar.gz
otp-9f9e948af31f6f313702bf83c31ec636ca7ca4fc.tar.bz2
otp-9f9e948af31f6f313702bf83c31ec636ca7ca4fc.zip
Merge branch 'rj/fix-remove-exec-bit'
* rj/fix-remove-exec-bit: Remove exec bit from files: info files, dat, bat Remove exec bit from files related to: XML, make, C Remove exec bit from: erl, hrl, xml, html, asn, gif, xpm OTP-9698
Diffstat (limited to 'erts')
-rw-r--r--[-rwxr-xr-x]erts/doc/src/erl_ext_fig.gifbin3834 -> 3834 bytes
-rw-r--r--[-rwxr-xr-x]erts/emulator/drivers/win32/win_efile.c0
-rw-r--r--[-rwxr-xr-x]erts/etc/win32/nsis/erlang_uninst.icobin766 -> 766 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/erts/doc/src/erl_ext_fig.gif b/erts/doc/src/erl_ext_fig.gif
index 14d6bbc871..14d6bbc871 100755..100644
--- a/erts/doc/src/erl_ext_fig.gif
+++ b/erts/doc/src/erl_ext_fig.gif
Binary files differ
diff --git a/erts/emulator/drivers/win32/win_efile.c b/erts/emulator/drivers/win32/win_efile.c
index 931bb196f1..931bb196f1 100755..100644
--- a/erts/emulator/drivers/win32/win_efile.c
+++ b/erts/emulator/drivers/win32/win_efile.c
diff --git a/erts/etc/win32/nsis/erlang_uninst.ico b/erts/etc/win32/nsis/erlang_uninst.ico
index edbd8a6f2c..edbd8a6f2c 100755..100644
--- a/erts/etc/win32/nsis/erlang_uninst.ico
+++ b/erts/etc/win32/nsis/erlang_uninst.ico
Binary files differ