aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-06-11 10:53:15 +0200
committerHenrik Nord <[email protected]>2014-06-11 10:53:15 +0200
commit6faf4aa0994f91be5c8537ed7d048fbe1642a574 (patch)
treeee3966b89cdfc9c854405ae4c6cfa60ddb8a0845 /erts/emulator
parent9731b5a5f4f453209ee07c8aea3008958601223a (diff)
parenta933cda32fd2dbae4e1367f98206bebfea39b86b (diff)
downloadotp-6faf4aa0994f91be5c8537ed7d048fbe1642a574.tar.gz
otp-6faf4aa0994f91be5c8537ed7d048fbe1642a574.tar.bz2
otp-6faf4aa0994f91be5c8537ed7d048fbe1642a574.zip
Merge branch 'nox/fix-perms' into maint
* nox/fix-perms: Fix permissions of some files in the repository
Diffstat (limited to 'erts/emulator')
-rw-r--r--[-rwxr-xr-x]erts/emulator/beam/erl_bif_info.c0
-rw-r--r--[-rwxr-xr-x]erts/emulator/beam/global.h0
-rw-r--r--[-rwxr-xr-x]erts/emulator/sys/win32/sys.c0
3 files changed, 0 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 4d5e55aaf5..4d5e55aaf5 100755..100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 891046a8b5..891046a8b5 100755..100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index 0ded6b274e..0ded6b274e 100755..100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c