[crossfire] [Crossfire-cvs] CVS commit: crossfire

[Tchize]

Andreas Kirschbaum wrote:
> Crossfire CVS repository messages. wrote:
>   
>> Module Name:    crossfire
>> Committed By:   ryo_saeba
>> Date:           Sat Jun 24 10:41:44 UTC 2006
>>
>> Modified Files:
>>         crossfire: ChangeLog
>>         crossfire/common: object.c
>>
>> Log Message:
>> Fix merging bug.
>>     
> [...]
>   
>> + common/object.c: don't consider FLAG_INV_LOCKED for can_merge.
>>     
>
> This definitely is not a "bug" but a feature (see my previous ChangeLog
> entry "Do not merge locked and unlocked items." from 2006-06-01).
>   
Guess i need to add this to unit test for future :)