aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2011-04-14 16:18:07 +0200
committerSverker Eriksson <[email protected]>2011-04-14 16:18:07 +0200
commitc9e14ed976cf7b1ed89eeb3e75a258c37981feb4 (patch)
tree99e2959d454e1cf52f9e81cb08a6f5d39e34b29c /lib
parent8cc4299ceade79d9649fa3516b15d17f9dd41d32 (diff)
parentfb1eab890f6776419b3999285dff45802658e8f0 (diff)
downloadotp-c9e14ed976cf7b1ed89eeb3e75a258c37981feb4.tar.gz
otp-c9e14ed976cf7b1ed89eeb3e75a258c37981feb4.tar.bz2
otp-c9e14ed976cf7b1ed89eeb3e75a258c37981feb4.zip
Merge branch 'maint-r14' into dev
Conflicts: erts/vsn.mk
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions