diff options
| author | Rickard Green <[email protected]> | 2018-11-28 22:23:42 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-11-28 22:23:42 +0100 |
| commit | d5a72ec4a13c4a42eb723abb286cde0e477ae88b (patch) | |
| tree | 8ea159915f8a1eaf17f6a96d0b7e48ed0efd3f09 /make | |
| parent | 71215060abff81b61844f8517bde72a2252cef53 (diff) | |
| parent | 704875328ebc9f605d7dd3e9dc5b895246396216 (diff) | |
| download | otp-d5a72ec4a13c4a42eb723abb286cde0e477ae88b.tar.gz otp-d5a72ec4a13c4a42eb723abb286cde0e477ae88b.tar.bz2 otp-d5a72ec4a13c4a42eb723abb286cde0e477ae88b.zip | |
Merge branch 'maint'
* maint:
Update patch solve forward merge version
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 b8626c4cff..7ed6ff82de 100644 --- a/make/otp_patch_solve_forward_merge_version +++ b/make/otp_patch_solve_forward_merge_version @@ -1 +1 @@ -4 +5 |