diff options
| author | Rickard Green <[email protected]> | 2018-10-21 18:30:39 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-10-21 18:30:39 +0200 |
| commit | 75f51e0f85cbd824d8a9c0202d04d7e5d6aad146 (patch) | |
| tree | ce9010e816e78b43579d61579698acc48b771fc8 /make | |
| parent | 7f5279f9e0c8ee6ac013328be65e687841fb425c (diff) | |
| parent | 71740452ead0ab57c98a7ce1d6ed24e9b8c24ab7 (diff) | |
| download | otp-75f51e0f85cbd824d8a9c0202d04d7e5d6aad146.tar.gz otp-75f51e0f85cbd824d8a9c0202d04d7e5d6aad146.tar.bz2 otp-75f51e0f85cbd824d8a9c0202d04d7e5d6aad146.zip | |
Merge branch 'maint'
* maint:
Add version info for internal patch merge scripts
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_patch_solve_forward_merge_version | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/make/otp_patch_solve_forward_merge_version b/make/otp_patch_solve_forward_merge_version new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/make/otp_patch_solve_forward_merge_version @@ -0,0 +1 @@ +2 |