aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/win32/sys.c
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-06-11 10:53:22 +0200
committerHenrik Nord <[email protected]>2014-06-11 10:53:22 +0200
commit3dd95149212105fd796cb6f03901e0f6a0b94575 (patch)
treede1da6804cf79342a2ce4b4c09753fa09509c50e /erts/emulator/sys/win32/sys.c
parent6faf4aa0994f91be5c8537ed7d048fbe1642a574 (diff)
parent8c4b42329f3e25e387a6511f9287c1f2bf8f2c4d (diff)
downloadotp-3dd95149212105fd796cb6f03901e0f6a0b94575.tar.gz
otp-3dd95149212105fd796cb6f03901e0f6a0b94575.tar.bz2
otp-3dd95149212105fd796cb6f03901e0f6a0b94575.zip
Merge branch 'matwey/arm' into maint
* matwey/arm: Add correct detection of powerpc architecture. Add correct detection of armv6hl and armv7hl architectures.
Diffstat (limited to 'erts/emulator/sys/win32/sys.c')
0 files changed, 0 insertions, 0 deletions