aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/unix
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-08-20 10:16:12 +0200
committerHenrik Nord <[email protected]>2015-08-20 10:16:12 +0200
commit25be5551705cf64f2ecc7be5f6c64c9c908e2938 (patch)
treeb7de5288a61f639972cba56e4868694eba917375 /erts/etc/unix
parent92f855b86e0c5c68d98465f8dc6ba6bc90618154 (diff)
parente3a5ad489d6e6cc190b609f8648b6af993c1b333 (diff)
downloadotp-25be5551705cf64f2ecc7be5f6c64c9c908e2938.tar.gz
otp-25be5551705cf64f2ecc7be5f6c64c9c908e2938.tar.bz2
otp-25be5551705cf64f2ecc7be5f6c64c9c908e2938.zip
Merge branch 'maint'
Conflicts: OTP_VERSION erts/vsn.mk
Diffstat (limited to 'erts/etc/unix')
0 files changed, 0 insertions, 0 deletions