diff options
| author | Marcus Arendt <[email protected]> | 2014-11-05 15:34:37 +0100 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-11-05 15:34:37 +0100 |
| commit | 39cd804e0a04cad11daabcc671ea71594e96f47b (patch) | |
| tree | ca62a0934eba72cf6ab17e50905f5c695b0c7852 /erts/vsn.mk | |
| parent | 0d18bf3268379df2b91e165a835426db77f015e3 (diff) | |
| parent | 682a6082159568f40615f03d12d44ee70edd14c6 (diff) | |
| download | otp-39cd804e0a04cad11daabcc671ea71594e96f47b.tar.gz otp-39cd804e0a04cad11daabcc671ea71594e96f47b.tar.bz2 otp-39cd804e0a04cad11daabcc671ea71594e96f47b.zip | |
Merge branch 'maint'
Conflicts:
erts/vsn.mk
Diffstat (limited to 'erts/vsn.mk')
0 files changed, 0 insertions, 0 deletions