Hi all, Norbert, may be this [1] the thing that you was asking for? —I've committed one correction in your name, I hope you are OK with that (you can see it as last commit).
Cheers! [1] https://github.com/Sanva/shotwell-gsoc/tree/faces-tool-dirty 2013/1/24 Norbert Preining <[email protected]> > Hi Lucas, > > hmmm ... > > On Mi, 23 Jan 2013, Lucas Beeler wrote: > > So I can merge all the changes from master into faces without incident. > > Indeed, > the first time I tried it wasn't working and tried to remerge > the whole changes as before. > Now I trashed my faces branch and made a re-checkout and did a test > commit to master and merged it, and it worked. > > Still the history is not nice because of the huge commit > that actually contains all the changes from master in one commit. > > Anyway, not my problem ;-) > > Ok, sorry for the noise ... > > Norbert > > ------------------------------------------------------------------------ > PREINING, Norbert http://www.preining.info > JAIST, Japan TeX Live & Debian Developer > DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094 > ------------------------------------------------------------------------ > _______________________________________________ > Shotwell mailing list > [email protected] > http://lists.yorba.org/cgi-bin/mailman/listinfo/shotwell > _______________________________________________ Shotwell mailing list [email protected] http://lists.yorba.org/cgi-bin/mailman/listinfo/shotwell
