diff options
| author | Henrik Nord <[email protected]> | 2015-08-20 10:16:12 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-08-20 10:16:12 +0200 |
| commit | 25be5551705cf64f2ecc7be5f6c64c9c908e2938 (patch) | |
| tree | b7de5288a61f639972cba56e4868694eba917375 /bootstrap/lib | |
| parent | 92f855b86e0c5c68d98465f8dc6ba6bc90618154 (diff) | |
| parent | e3a5ad489d6e6cc190b609f8648b6af993c1b333 (diff) | |
| download | otp-25be5551705cf64f2ecc7be5f6c64c9c908e2938.tar.gz otp-25be5551705cf64f2ecc7be5f6c64c9c908e2938.tar.bz2 otp-25be5551705cf64f2ecc7be5f6c64c9c908e2938.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
erts/vsn.mk
Diffstat (limited to 'bootstrap/lib')
0 files changed, 0 insertions, 0 deletions