gEDA-dev: cvs merging: how to merge ChangeLog files

[Ales Hvezda]

Hi Werner,

[snip]
>I plan to merge the autonumber branch tomorrow.
>
>I hope it's ok to merge it in before the glist_dev as there are still 
>some ongoing discussions.

I think it is okay, if the changes are localized to the autonumber
dialog box.

								-Ales