Mergeable branch is available here: https://gitorious.org/solid-partitioner/solid-partitioner under the name partitioner-merge. This branch has been created from a master branch I updated right before, and then "partitioner" has been merged on it. During the merge I had conflicts only on files I never modified, so I always chose the HEAD option over partitioner's. It compiles and from my application it works as before.
Please run some tests over my code: you can find the application to do so in the other repository on gitorious. I repeated all the tests I could think of on my computer over and over using USB pens, but of course this is far from what is needed for a reliable partitioning library :) Cheers, Lisa 2012/12/12 Sebastian Kügler <[email protected]> > On Tuesday, December 11, 2012 20:42:33 Lisa Vitolo wrote: > > What do you mean by mergeable with 4.10? > > A patch or branch that cleanly applies against 4.10 (so the master branch > in > most repositories right now). > -- > sebas > > http://www.kde.org | http://vizZzion.org | GPG Key ID: 9119 0EF9 > -- “I'll be more enthusiastic about encouraging thinking outside the box when there's evidence of any thinking going on inside it.”
_______________________________________________ Kde-hardware-devel mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-hardware-devel
