> On May 7, 2013, 7:40 p.m., Marco Martin wrote: > > Ship It! > > Hrvoje Senjan wrote: > Marco, sorry for bothering, but i only commited to 4.10, as there are > some conflicts, and i'm not comfortable resolving them. Could you/or someone > merge the branch to master? Thanks
Try to cherry-pick instead - Marco ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/110350/#review32216 ----------------------------------------------------------- On May 7, 2013, 7:48 p.m., Hrvoje Senjan wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://git.reviewboard.kde.org/r/110350/ > ----------------------------------------------------------- > > (Updated May 7, 2013, 7:48 p.m.) > > > Review request for Plasma, Marco Martin and Oliver Henshaw. > > > Description > ------- > > Because is nicer ;-) > > > Diffs > ----- > > > ksmserver/screenlocker/greeter/themes/org.kde.passworddialog/contents/ui/main.qml > 57c0415 > > Diff: http://git.reviewboard.kde.org/r/110350/diff/ > > > Testing > ------- > > Yes, see the screenshots. Also noticeable with Elarun. > > > File Attachments > ---------------- > > Current look > http://git.reviewboard.kde.org/media/uploaded/files/2013/05/07/current.png > patched > > http://git.reviewboard.kde.org/media/uploaded/files/2013/05/07/smoothened.png > > > Thanks, > > Hrvoje Senjan > >
_______________________________________________ Plasma-devel mailing list Plasma-devel@kde.org https://mail.kde.org/mailman/listinfo/plasma-devel
