diff options
author | Raimo Niskanen <[email protected]> | 2011-06-08 15:28:39 +0200 |
---|---|---|
committer | Raimo Niskanen <[email protected]> | 2011-06-08 15:28:39 +0200 |
commit | 3b818d5ec09cd2bb4c650776b898af9206f13c68 (patch) | |
tree | 276777cac5b57b1d3beab2abf5d496ec36517c4f /erts/info.src | |
parent | 8ad38e22ca724906fb1e3c789f4846c0c81d284d (diff) | |
parent | a8056b31944c228f16a27034f07ffad59190984e (diff) | |
download | otp-3b818d5ec09cd2bb4c650776b898af9206f13c68.tar.gz otp-3b818d5ec09cd2bb4c650776b898af9206f13c68.tar.bz2 otp-3b818d5ec09cd2bb4c650776b898af9206f13c68.zip |
Merge branch 'sa/prim-file-fix' into dev
* sa/prim-file-fix:
Update preloaded module
Replace atom in DRV macro in prim_file with string
Diffstat (limited to 'erts/info.src')
0 files changed, 0 insertions, 0 deletions