diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-05-09 10:46:46 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-05-09 10:46:46 +0200 |
| commit | d5f8d55b37c9c63418b4fe8ad5a5aa197a9a4385 (patch) | |
| tree | 86d64e258d53069ba44e8bd22157d43df864e994 /erts/obj | |
| parent | 5c86b4f9fa77354ee20a67cd5f63c1abd4af1afb (diff) | |
| parent | f18a1ab083e20f066a532a9c3d87e848251c1d9c (diff) | |
| download | otp-d5f8d55b37c9c63418b4fe8ad5a5aa197a9a4385.tar.gz otp-d5f8d55b37c9c63418b4fe8ad5a5aa197a9a4385.tar.bz2 otp-d5f8d55b37c9c63418b4fe8ad5a5aa197a9a4385.zip | |
Merge branch 'ingela/inets/next-version'
* ingela/inets/next-version:
inets: Prepare for release
Conflicts:
lib/inets/vsn.mk
Diffstat (limited to 'erts/obj')
0 files changed, 0 insertions, 0 deletions