Commit Graph

18 Commits

Author SHA1 Message Date
pooka ce0a2bbbef end this destructive conflict 2002-07-09 14:59:52 +00:00
pooka 184b2ef7fa conflict therapy 2002-05-18 07:00:44 +00:00
pooka 59a767d683 resolve conflicts 2001-09-09 10:46:36 +00:00
pooka 9ac45dc28d resolve conflicts 2001-07-22 22:53:00 +00:00
pooka a2f50a2443 resolve conflicts 2001-03-17 11:21:51 +00:00
pooka d98ea99cc1 resolve conflicts 2000-11-23 23:21:14 +00:00
pooka e5efd07a0b resolve conflicts 2000-09-22 16:34:59 +00:00
christos 5d9fa0390d Resolve conflicts 2000-05-14 22:53:37 +00:00
christos 7d48644528 Resolve corn flakes. 1999-11-01 17:39:26 +00:00
christos faf55c153e resolve corn flakes. 1998-09-20 15:27:15 +00:00
christos 704854c465 Update to version 3.22 1997-01-28 00:49:36 +00:00
tls 9d225a1783 RCS ID police 1997-01-09 20:18:21 +00:00
christos 1b1e1884b3 Changes from file-3.21 1996-10-05 20:20:24 +00:00
christos b2b8843794 Update to file-3.19.
- Magic fixes
- MAGIC environment variable processing
- Better LEGAL.NOTICE
- -m magic : separated list of magic files processing
1995-10-27 23:33:14 +00:00
christos 21db3a398a Updated to file-3.18 1995-05-21 00:13:24 +00:00
christos 0bb1fbddb3 Integrated file-3.17 1995-04-28 19:23:38 +00:00
christos 7e99ebc790 Updated to file-3.16; fixes PR867 1995-03-25 22:35:28 +00:00
jtc ebefd0d08f Updated to Ian Darwin's latest release.
Adds lots of neat features from most other vendors file(1) commands,
plus (important!) little and big endian file types.  This will alow
us to detect and extract meaningful information from a many more
file types.
1993-06-10 00:37:55 +00:00