| #
9469f4f1 |
| 24-Sep-2024 |
christos <christos@NetBSD.org> |
merge conflicts between OpenSSH-9.8 and 9.9
|
| #
1c7715dd |
| 08-Jul-2024 |
christos <christos@NetBSD.org> |
resolve conflicts between 9.7 and 9.8
|
| #
a629fefc |
| 25-Oct-2023 |
christos <christos@NetBSD.org> |
Merge conflicts between 9.3 and 9.5
|
| #
b1066cf3 |
| 26-Jul-2023 |
christos <christos@NetBSD.org> |
Merge changes between OpenSSH-9.1 and OpenSSH-9.3
|
| #
a03ec00c |
| 23-Feb-2022 |
christos <christos@NetBSD.org> |
Merge differences between openssh-8.8 and openssh-8.9
|
| #
b592f463 |
| 02-Sep-2021 |
christos <christos@NetBSD.org> |
Merge our changes from OpenSSH-8.6 to OpenSSH-8.7
|
| #
17418e98 |
| 05-Mar-2021 |
christos <christos@NetBSD.org> |
merge local changes between openssh 8.4 and 8.5
|
| #
2d3b0f52 |
| 04-Dec-2020 |
christos <christos@NetBSD.org> |
Merge conflicts
|
| #
8db691be |
| 28-May-2020 |
christos <christos@NetBSD.org> |
Merge conflicts
|
| #
ed75d7a8 |
| 27-Feb-2020 |
christos <christos@NetBSD.org> |
Merge conflicts
|
| #
cd4ada6a |
| 12-Oct-2019 |
christos <christos@NetBSD.org> |
merge openssh-8.1
|
| #
aa36fcac |
| 20-Apr-2019 |
christos <christos@NetBSD.org> |
merge conflicts.
|
| #
d91f98a8 |
| 27-Jan-2019 |
pgoyette <pgoyette@NetBSD.org> |
Merge the [pgoyette-compat] branch
|
| #
ffae97bb |
| 06-Apr-2018 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
b400d007 |
| 05-Feb-2018 |
christos <christos@NetBSD.org> |
patch for OpenSSL-1.1
|
| #
7a183406 |
| 07-Oct-2017 |
christos <christos@NetBSD.org> |
merge conflicts.
|
| #
41768fc1 |
| 18-Apr-2017 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
ee85abc4 |
| 25-Dec-2016 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
79976551 |
| 11-Mar-2016 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
8395c133 |
| 13-Aug-2015 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
4054ffb0 |
| 03-Jul-2015 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
e4d43b82 |
| 03-Apr-2015 |
christos <christos@NetBSD.org> |
Merge conflicts
|
| #
8a4530f9 |
| 19-Oct-2014 |
christos <christos@NetBSD.org> |
merge openssh-6.7
|
| #
00a838c4 |
| 08-Nov-2013 |
christos <christos@NetBSD.org> |
merge conflicts.
|
| #
185c8f97 |
| 25-Jul-2011 |
christos <christos@NetBSD.org> |
- Merge conflicts
- WARNS=5
|