Merge branch 'vendor/FILE'
authorPeter Avalos <pavalos@dragonflybsd.org>
Mon, 16 May 2011 04:08:40 +0000 (18:08 -1000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Mon, 16 May 2011 04:08:59 +0000 (18:08 -1000)
commit0e5ac7dcff4ec887765a72a010b6fffb07547e84
treee7fab5c26cb755f6cf6381067e5a3de2bcc1c6dc
parent3ed2fff367234c63795998a33c7c1b803b57bd03
parent884044a574904c56cc0441938f957625f5153d6c
Merge branch 'vendor/FILE'
contrib/file/src/apprentice.c
lib/libmagic/config.h