aboutsummaryrefslogtreecommitdiffstats
path: root/erts/lib_src
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-06-16 15:21:15 +0200
committerRickard Green <[email protected]>2014-06-16 15:21:15 +0200
commit51bf9a291c1a3ed59a28879d422485d794ea5b7c (patch)
tree1b5c08b997dd0f5fd4c1cdd6acd75ea910d14bb6 /erts/lib_src
parentd82e6d9495db0b2583b4e65133dca0840c9842a7 (diff)
parent42319ef8bf50bd6e607d6154a4ab1c041bb08551 (diff)
downloadotp-51bf9a291c1a3ed59a28879d422485d794ea5b7c.tar.gz
otp-51bf9a291c1a3ed59a28879d422485d794ea5b7c.tar.bz2
otp-51bf9a291c1a3ed59a28879d422485d794ea5b7c.zip
Merge branch 'maint'
* maint: Fix redefinition of ETHR_FORCE_INLINE Fix typo in error message in reltool_server
Diffstat (limited to 'erts/lib_src')
0 files changed, 0 insertions, 0 deletions