Review Request: Merge the final and fixed QML battery monitor to master.

[Marco Martin]

On Monday 02 April 2012, Viranch Mehta wrote:
> > On April 2, 2012, 12:25 p.m., Sebastian Kügler wrote:
> > > Looking good now, thanks a lot for your patience!
> > > 
> > > I'm getting this TypeError still, haven't looked into the reason behind
> > > it:
> > > file:///home/sebas/kdesvn/install/share/apps/plasma/plasmoids/battery/
> > > contents/ui/batterymonitor.qml:77: TypeError: Result of expression
> > > 'pmSource.data["PowerDevil"]' [undefined] is not an object.
> > > 
> > > I propose to merge it into master now. There's still a bit of polishing
> > > possible (margins, for example), but we can easily do those when it's
> > > in master.
> 
> I'm not getting the TypeError here. About the merge, I have worked on QML
> lock/logout applet in the same branch. So should I just copy-paste QML
> battery monitor into master, or cherry-pick from the branch to preserve
> the history?

hmm, not too happy about both, let's make lock/logout work as well then merge 
everything?
-- 
Marco Martin