aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2011-12-30 15:21:24 +0100
committerRickard Green <[email protected]>2011-12-30 15:21:24 +0100
commit34dca57472ba2f4e82bb03d3713e3318613093bb (patch)
tree9dfc465ec5f64edd5c2304117228ba834b43dcae /lib
parent8769a849dbbb70cb92733f484b2a0e1693e97eb7 (diff)
parentc6d37ba58c505ead46a3e939b3d38236dbd20aa5 (diff)
downloadotp-34dca57472ba2f4e82bb03d3713e3318613093bb.tar.gz
otp-34dca57472ba2f4e82bb03d3713e3318613093bb.tar.bz2
otp-34dca57472ba2f4e82bb03d3713e3318613093bb.zip
Merge branch 'maint-r15' into maint
Conflicts: erts/vsn.mk
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions