Merge branch 'vendor/FILE'
authorPeter Avalos <pavalos@theshell.com>
Sun, 21 Jun 2009 00:48:42 +0000 (14:48 -1000)
committerPeter Avalos <pavalos@theshell.com>
Sun, 21 Jun 2009 00:48:42 +0000 (14:48 -1000)
commit4b2ca6f6baa1b8995a0c76596f55d3b799d9dd0f
treee6ecf30a61d0603a2ba3f1a73f8f3da0a1f96b7f
parenta960442f08857d21d946b4ec4e73c32360553a7c
parent79343712f725e22dd7010730453b5f3a7b17bb4f
Merge branch 'vendor/FILE'
Makefile_upgrade.inc
contrib/file/src/apprentice.c
lib/libmagic/Makefile
lib/libmagic/config.h