aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-09-30 17:02:55 +0200
committerFredrik Gustafsson <[email protected]>2013-09-30 17:02:55 +0200
commite0ecc86e35475b434efa6cccba44074ca1040b7a (patch)
tree13f1622acea6b0af4536eb739af58a351b1fb8bf /lib
parente6b5ae09d292ee0251aab875be1d3245f260b493 (diff)
parentabac2eda110a33d8310c0f9cc152d91de37f731d (diff)
downloadotp-e0ecc86e35475b434efa6cccba44074ca1040b7a.tar.gz
otp-e0ecc86e35475b434efa6cccba44074ca1040b7a.tar.bz2
otp-e0ecc86e35475b434efa6cccba44074ca1040b7a.zip
Merge branch 'maint-r16' into maint
Conflicts: erts/vsn.mk
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions