On Sun, 20 May 2012, Henry Gebhardt wrote: > On Sun, May 20, 2012 at 12:38:45AM +0200, Martin Bagge / brother wrote: >> On Sat, 19 May 2012, Henry Gebhardt wrote: >>> The following changes since commit 2dde9fd074b87de77c31eece87ec606587159c40: >>> galt_gendo (1): >>> draw using cairo - ID: 3525879 >> >> This patch has no idetification and can not be applied without force. >> >> commit 15b0b7077fde46b44552b829127d2a086787cc29 >> Author: galt_gendo <> >> Date: Thu May 17 02:49:18 2012 +020 >> >> Was that intentional? > > Kind of, because I don't have the author's email address. > > But he has notified me of some problems with the patch, so might as well > hold off for now.
And I am not at all comfortable resolving conflicts in code I do not understand. I tried to just rebase and remove the commit in question but the following commit is based on that and because of that conflicts and fails at it seems. Can you please update your branch? Then I can rebase on master and build from that. -- /brother http://martin.bagge.nu Only one security god has a surname with three adjacent vowels. ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Lxde-list mailing list Lxde-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxde-list
