Also I forgot to expand one of the tabs in kdiff3 and so mis-estimated how many changes there were.
Another issue is that he didn't import one of the current git repositories, he just checked in what I assume was a tar extract. Most annoyingly is he made some changes before his initial commit. It looks like his initial commit is based on 38eddc63542d08484e83e3a0c21d163b638989bd in the gst-1.0-port branch. I merged his patches into my repository and rebased it onto my gst-1.0-port branch. https://github.com/detrout/ktp-call-ui/commits/kaditx The patches still need to be actually reviewed. Diane On Tuesday, July 15, 2014 15:04:14 David Edmundson wrote: > The first repo loads the QML files from the second one: > > https://gitorious.org/kde-telepathy-kaditx/ktp-call-newui/commit/f85fb223884 > 7fb4db703f66fb6c1b900d1d86275 > > Some patches look easily mergeable, some will take some time > (for example the line commit above src/qmlInterface.cpp line 16 is > hardcoded to /home/kaditx, which isn't entirely portable :) ) > > Fortunately it looks quite well split up with the exception of 3cc5896 > > I suggest: > - I merge that TpQt GStreamer changes and release it > - We merge the current 1.0 porting > - We start merging these. I dunno if it's easier in one big go or in > batches _______________________________________________ > KDE-Telepathy mailing list > [email protected] > https://mail.kde.org/mailman/listinfo/kde-telepathy _______________________________________________ KDE-Telepathy mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-telepathy
