Merge branch 'vendor/FILE'
authorPeter Avalos <pavalos@dragonflybsd.org>
Sat, 31 Dec 2011 20:44:00 +0000 (12:44 -0800)
committerPeter Avalos <pavalos@dragonflybsd.org>
Sat, 31 Dec 2011 20:44:24 +0000 (12:44 -0800)
commit47f970a328bab4a33ac48dd00ee7bbd42421ee3a
tree7306f807407da9042d8d1ca8de8565c767cc1e0b
parent7544493bd138e34bca410fbbad383bb7bb7ddbfb
parent9f86ab308fed0018345e1f01dda2d5da2cdd1612
Merge branch 'vendor/FILE'
contrib/file/src/apprentice.c
lib/libmagic/config.h