| version 1.126 | version 1.127 | |||
|---|---|---|---|---|
|
| |||
| /* | /* | |||
| * static char *rcsid_object_c = | * static char *rcsid_object_c = | |||
| * "$Id: object.c,v 1.126 2006/06/01 20:55:54 akirschbaum Exp $"; | * "$Id: object.c,v 1.127 2006/06/02 08:19:35 akirschbaum Exp $"; | |||
| */ | */ | |||
| /* | /* | |||
|
| |||
| break; | break; | |||
| } | } | |||
| /* Don't merge items with differing custom names. */ | ||||
| if (ob1->custom_name != ob2->custom_name) return 0; | ||||
| /* Everything passes, must be OK. */ | /* Everything passes, must be OK. */ | |||
| return 1; | return 1; | |||
| } | } |
Legend:
| ||||||