History log of /netbsd-current/crypto/external/bsd/openssl/dist/include/internal/tsan_assist.h
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 1.7 07-May-2023 christos

merge conflicts between 1.1.1t and 3.0.8


Revision tags: netbsd-10-base cjep_sun2x-base1 cjep_sun2x-base cjep_staticlib_x-base1 cjep_staticlib_x-base phil-wifi-20200421 phil-wifi-20200411 is-mlppp-base phil-wifi-20200406
# 1.6 23-Jan-2020 christos

resolve conflicts


Revision tags: netbsd-9-0-RC1 phil-wifi-20191119 netbsd-9-base phil-wifi-20190609
# 1.5 09-Jun-2019 christos

branches: 1.5.2; 1.5.4;
merge conflicts, regen man pages.


# 1.4 12-Mar-2019 christos

merge conflicts


Revision tags: pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226
# 1.3 08-Dec-2018 christos

Merge conflicts


Revision tags: pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930
# 1.2 23-Sep-2018 christos

branches: 1.2.2;
merge conflicts


# 1.1 23-Sep-2018 christos

branches: 1.1.1;
Initial revision


# 1.6 23-Jan-2020 christos

resolve conflicts


Revision tags: netbsd-9-0-RC1 phil-wifi-20191119 netbsd-9-base phil-wifi-20190609
# 1.5 09-Jun-2019 christos

branches: 1.5.2;
merge conflicts, regen man pages.


# 1.4 12-Mar-2019 christos

merge conflicts


Revision tags: pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226
# 1.3 08-Dec-2018 christos

Merge conflicts


Revision tags: pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930
# 1.2 23-Sep-2018 christos

branches: 1.2.2;
merge conflicts


# 1.1 23-Sep-2018 christos

branches: 1.1.1;
Initial revision


Revision tags: phil-wifi-20190609
# 1.5 09-Jun-2019 christos

merge conflicts, regen man pages.


# 1.4 12-Mar-2019 christos

merge conflicts


Revision tags: pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226
# 1.3 08-Dec-2018 christos

Merge conflicts


Revision tags: pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930
# 1.2 23-Sep-2018 christos

branches: 1.2.2;
merge conflicts


# 1.1 23-Sep-2018 christos

branches: 1.1.1;
Initial revision


# 1.4 12-Mar-2019 christos

merge conflicts


Revision tags: pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226
# 1.3 08-Dec-2018 christos

Merge conflicts


Revision tags: pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930
# 1.2 23-Sep-2018 christos

branches: 1.2.2;
merge conflicts


# 1.1 23-Sep-2018 christos

branches: 1.1.1;
Initial revision


# 1.2 23-Sep-2018 christos

merge conflicts


# 1.1 23-Sep-2018 christos

branches: 1.1.1;
Initial revision