aboutsummaryrefslogtreecommitdiffstats
path: root/make/otp.mk.in
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-06-18 08:46:27 +0200
committerIngela Anderton Andin <[email protected]>2014-06-18 08:46:27 +0200
commitbc9085f3eb033a99d128cba9403a63c9b3d51644 (patch)
tree2a79768c78ac1e86b17fbd389588597002edd34f /make/otp.mk.in
parent805f9c89fc01220bc1bb0f27e1b68fd4eca688ba (diff)
parent608b77fa435c10966d37efedfe1e3b6d7e442c50 (diff)
downloadotp-bc9085f3eb033a99d128cba9403a63c9b3d51644.tar.gz
otp-bc9085f3eb033a99d128cba9403a63c9b3d51644.tar.bz2
otp-bc9085f3eb033a99d128cba9403a63c9b3d51644.zip
Merge branch 'ia/inets/prep-for-release' into maint
* ia/inets/prep-for-release: inets: Prepare for release
Diffstat (limited to 'make/otp.mk.in')
0 files changed, 0 insertions, 0 deletions