aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-06-11 10:53:28 +0200
committerHenrik Nord <[email protected]>2014-06-11 10:53:28 +0200
commit18615c8555c38b98486d5e29257178f06c810a09 (patch)
tree881dced29f66239417b72992e4a8cf97999fe936 /erts/emulator
parent7372e3e8adc6cc9f0b59a4bc47ea0a1af3e5fd1f (diff)
parent3dd95149212105fd796cb6f03901e0f6a0b94575 (diff)
downloadotp-18615c8555c38b98486d5e29257178f06c810a09.tar.gz
otp-18615c8555c38b98486d5e29257178f06c810a09.tar.bz2
otp-18615c8555c38b98486d5e29257178f06c810a09.zip
Merge branch 'maint'
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 ae44c8424f..ae44c8424f 100755..100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c