comparison admin/alloc-colors.c @ 54203:a37354a6c326

Resolve CVS conflicts
author Miles Bader <miles@gnu.org>
date Sun, 29 Feb 2004 22:18:04 +0000
parents 695cf19ef79e
children c53a9463c31a 375f2633d815
comparison
equal deleted inserted replaced
54202:8491a6eafd00 54203:a37354a6c326