aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/zlib
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2015-11-02 17:41:52 +0100
committerLukas Larsson <[email protected]>2015-11-02 17:41:52 +0100
commit72cc231e0186d98e52f7a1debdea624d4bbf1125 (patch)
treef70983e4c42645af09fca2a91e7e031d8783863b /erts/emulator/zlib
parent6a421403ce98d1863f416d9ca00b8f2de07b419a (diff)
parentf76ba62c7869bb7bbda27446d0a9f7214062db4f (diff)
downloadotp-72cc231e0186d98e52f7a1debdea624d4bbf1125.tar.gz
otp-72cc231e0186d98e52f7a1debdea624d4bbf1125.tar.bz2
otp-72cc231e0186d98e52f7a1debdea624d4bbf1125.zip
Merge branch 'lukas/erts/win32_bool_fix/OTP-13079' into maint
* lukas/erts/win32_bool_fix/OTP-13079: erts: bool is a reserved word, use boolean instead
Diffstat (limited to 'erts/emulator/zlib')
0 files changed, 0 insertions, 0 deletions