History log of /netbsd-src/external/bsd/file/dist/magic/magdir/archive (Results 1 – 21 of 21)
Revision Date Author Comments
# ddb17682 18-Aug-2023 christos <christos@NetBSD.org>

merge conflicts between file-5.43 and file-5.45


# 1d4cb158 24-Sep-2022 christos <christos@NetBSD.org>

merge changes between 5.40 and 5.43


# d87b0039 09-Apr-2021 christos <christos@NetBSD.org>

merge local changes between 5.39 and 5.40 and add magic entries from HEAD.


# 29faeba7 15-Jun-2020 christos <christos@NetBSD.org>

merge conflicts


# 78a23c3a 17-Dec-2019 christos <christos@NetBSD.org>

merge conflicts


# d0c65b7b 22-May-2019 christos <christos@NetBSD.org>

merge conflicts


# c02f7f97 19-Oct-2018 christos <christos@NetBSD.org>

Merge conflicts


# 5efe63de 15-Apr-2018 christos <christos@NetBSD.org>

merge conflicts for file-5.33


# 051bdd9a 08-Sep-2017 christos <christos@NetBSD.org>

merge file-5.32


# e2725312 25-May-2017 christos <christos@NetBSD.org>

merge 5.31


# 74db5203 10-Feb-2017 christos <christos@NetBSD.org>

merge conflicts


# 58b7f199 10-Oct-2014 christos <christos@NetBSD.org>

welcome to file-5.20


# 819e6405 13-Jun-2014 christos <christos@NetBSD.org>

merge conflicts


# c2e19894 23-Mar-2013 christos <christos@NetBSD.org>

merge new file


# 20d96732 03-Jan-2013 christos <christos@NetBSD.org>

merge changes


# 046a38dd 22-Feb-2012 christos <christos@NetBSD.org>

merge conflicts


# 6762e6f1 28-Sep-2011 christos <christos@NetBSD.org>

comment out weak magic, from file HEAD.


# 79bb278a 16-Sep-2011 christos <christos@NetBSD.org>

merge changes


# 2344ff98 13-May-2011 christos <christos@NetBSD.org>

resolve conflicts


# 9132e9e0 08-May-2009 christos <christos@NetBSD.org>

apply our local patches


# 1b108b8b 08-May-2009 christos <christos@NetBSD.org>

from ftp.astron.com