On Fri, 2005-04-01 at 17:17 +0200, Christophe Fergeau wrote: > Le vendredi 01 avril 2005 à 17:12 +0200, Oliver Lemke a écrit : > > > > I'm planning to provide an arch mirror of the merged sources on the > > weekend. > > Did you have some manual editing to do, or was it enough to apply the > album art and play queue patches on top of a "regular" rb source tree? As a basis I took your playbin branch (because the regular main-0.9 version was crashing on me all the time), then used join-branch and star-merge to pull in the queue and cover-art trees. There are quite a lot of conflicts to be resolved manually. But I'm not yet too familiar with arch, so maybe there is a better way to do the merging than the "straightforward" star-merge? -- so long, oliver Public GPG Key: http://www.core-dump.info/olemke-public.asc Fingerprint: 2389 0B2C 1AA8 4E3E D5AD 3B72 00DB ABDC 73ED C558
Attachment:
signature.asc
Description: This is a digitally signed message part