diff options
| author | Rickard Green <[email protected]> | 2018-10-22 18:25:27 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-10-22 18:25:27 +0200 |
| commit | d5ad94075c7b8e396f780aba55c70363ce4738c4 (patch) | |
| tree | 0513eb78abfa9ba3ab73ed06657782abaa965bb7 /make | |
| parent | 890f24e9d364ba19952b1341088c079370d3271b (diff) | |
| parent | 18aabe65117a7c2f9ca55bcbbfaa8847af9486ed (diff) | |
| download | otp-d5ad94075c7b8e396f780aba55c70363ce4738c4.tar.gz otp-d5ad94075c7b8e396f780aba55c70363ce4738c4.tar.bz2 otp-d5ad94075c7b8e396f780aba55c70363ce4738c4.zip | |
Merge branch 'maint'
* maint:
Update version info for internal patch merge scripts
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_patch_solve_forward_merge_version | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make/otp_patch_solve_forward_merge_version b/make/otp_patch_solve_forward_merge_version index 0cfbf08886..00750edc07 100644 --- a/make/otp_patch_solve_forward_merge_version +++ b/make/otp_patch_solve_forward_merge_version @@ -1 +1 @@ -2 +3 |