[Cdrdao-devel] Re: Gcdmaster source updates

[Manuel C. <ll...@er...>]

Andreas Mueller wrote:
> Hi Manuel,
> 
> I've modified some source files of gcdmaster. Can you please merge them
> into the new gtkmm2 branch.

Well, I don't know how to do it :)

I think that at some point when I finish the porting, I will merge the 
gtkmm2 branch with the main branch, and the colisions are handled manually.

> ProgressDialog.cc: The cancel button stayed disabled if pressed once.
> 
> CdDevice.cc CdDevice.h DeviceConfDialog.cc
> DumpCDProject.cc DuplicateCDProject.cc
> RecordCDSource.cc RecordCDSource.h
> RecordCDTarget.cc RecordCDTarget.h
> RecordTocDialog.cc: Added options for --overburn and --read-subchan

Anyway, if you know how can I get the changes in my branch, tell me. But 
as I have already modified this files, it can be a pain. Perhaps it is 
better to wait until the merge and solve the problems then.

-- 
Manuel Clos
ll...@er...

TCPA y Palladium: http://bulmalug.net/body.phtml?nIdNoticia=1398
TCPA and Palladium: http://www.cl.cam.ac.uk/~rja14/tcpa-faq.html