aboutsummaryrefslogtreecommitdiffstats
path: root/erts/prebuild.skip
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2011-01-26 14:02:08 +0100
committerLars Thorsen <[email protected]>2011-01-26 14:02:08 +0100
commit62dad961329a603110ce0e1d3f62554cc5228152 (patch)
treec9627305414d6ccc04eaf3485ec84543ab55bef4 /erts/prebuild.skip
parent14c9ff21544da8b5e195601ea21f9c954ee847da (diff)
parent4e28e50fbfbccba4d35197e21337655107ff0247 (diff)
downloadotp-62dad961329a603110ce0e1d3f62554cc5228152.tar.gz
otp-62dad961329a603110ce0e1d3f62554cc5228152.tar.bz2
otp-62dad961329a603110ce0e1d3f62554cc5228152.zip
Merge branch 'uw/xmerl-expand-simple/OTP-9034' into dev
* uw/xmerl-expand-simple/OTP-9034: Track parents when expanding #xmlElement records
Diffstat (limited to 'erts/prebuild.skip')
0 files changed, 0 insertions, 0 deletions