El Dimarts, 24 de setembre de 2013, a les 18:28:09, Jaydeep Solanki va escriure: > On Tue, Sep 24, 2013 at 2:08 AM, Albert Astals Cid <aa...@kde.org> wrote: > > El Dimarts, 24 de setembre de 2013, a les 01:44:35, Jaydeep Solanki va > > > > escriure: > > > Hi, > > > > > > Here's a link > > > <https://www.dropbox.com/s/wl8yobpk6oc6i79/GSoC%20patches.pdf>to a file > > > showing all the bug fixes and features implemented by me during GSoC. > > > > > > P.S. I have ignored small and tiny commits. > > > > Nice, can you please make sure you merge master to your branch? > > 'master' to 'epub-qtextdoc' ?
Yes > is this just for testing if there are any > conflicts ? It is also that I can diff the branches more easily. > > Or did you mean, 'epub-qtextdoc' to 'master' ? No, I don't want you to merge all your stuff to master without review. Cheers, Albert > > > Cheers, > > > > Albert > > > > > Had a great time! > > > More importantly learned a lot, and all the credit goes to Albert. :) > > > > > > Cheers, > > > Jaydeep > > > > _______________________________________________ > > Okular-devel mailing list > > Okular-devel@kde.org > > https://mail.kde.org/mailman/listinfo/okular-devel _______________________________________________ Okular-devel mailing list Okular-devel@kde.org https://mail.kde.org/mailman/listinfo/okular-devel