[Kde-pim] Review Request 117245: Coding Style for transportresourcebase_p.h

[Daniel Vrátil]

--===============5209764139245787760==
Content-Type: multipart/signed; boundary="nextPart3112651.RpVyd9PVSf"; micalg="pgp-sha1"; protocol="application/pgp-signature"


--nextPart3112651.RpVyd9PVSf
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"

On Sunday 13 of April 2014 21:02:56 laurent Montel wrote:
> Is it possible to apply all theses commits to 4.13 branch ?
> Each time that we make a fix in 4.13 we have a conflict in master.
> It=E2=80=99s not easy to work after that.
>=20
> This morning 3 fix in 4.13 =3D> 3 conflicts in master.
>=20
> Master and 4.13 is same for the moment so apply it in 4.13 will not p=
rovide
> conflict after that.
> And we merge in master after commit

Yes, I think it makes sense. We can then merge 4.13 to master and resol=
ve all=20
conflicts for good.

Thanks for going through the reviews, Kevin.

Dan

> Be carefull just commit in 4.13 branch
>
>=20
> Regards
>=20
> On dimanche 13 avril 2014 18:29:34 Kevin Krammer wrote:
> > -----------------------------------------------------------
> > This is an automatically generated e-mail. To reply, visit:
> > https://git.reviewboard.kde.org/r/117245/#review55663
> > -----------------------------------------------------------
> >=20
> > Ship it!
> >=20
> >=20
> > Ship It!
> >=20
> > - Kevin Krammer
> >=20
> > On March 31, 2014, 4:32 p.m., Guy Maurel wrote:
> > > -----------------------------------------------------------
> > > This is an automatically generated e-mail. To reply, visit:
> > > https://git.reviewboard.kde.org/r/117245/
> > > -----------------------------------------------------------
> > >=20
> > > (Updated March 31, 2014, 4:32 p.m.)
> > >=20
> > >=20
> > > Review request for KDEPIM-Libraries and Dan Vr=C3=A1til.
> > >=20
> > >=20
> > > Repository: kdepimlibs
> > >=20
> > >=20
> > > Description
> > > -------
> > >=20
> > > This is the second run.
> > >=20
> > > Details can be seen at:
> > >   http://techbase.kde.org/Policies/Kdepim_Coding_Style
> > >=20
> > > Diffs
> > > -----
> > >=20
> > >   akonadi/transportresourcebase_p.h 4f4ca14
> > >=20
> > > Diff: https://git.reviewboard.kde.org/r/117245/diff/
> > >=20
> > >=20
> > > Testing
> > > -------
> > >=20
> > >=20
> > > Thanks,
> > >=20
> > > Guy Maurel
> >=20
> > _______________________________________________
> > KDE PIM mailing list kde-pim at kde.org
> > https://mail.kde.org/mailman/listinfo/kde-pim
> > KDE PIM home page at http://pim.kde.org/
>=20
> Laurent Montel | laurent.montel at kdab.com | KDE/Qt Senior Software Eng=
ineer
> KDAB (France) S.A.S., a KDAB Group company
> Tel. France +33 (0)4 90 84 08 53,  http://www.kdab.fr

=2D-=20
Daniel Vr=C3=A1til | dvratil at redhat.com | dvratil on #kde-devel, #konta=
ct, #akonadi
KDE Desktop Team
Associate Software Engineer, Red Hat, Inc.

GPG Key: 0xC59D614F6F4AE348
Fingerprint: 4EC1 86E3 C54E 0B39 5FDD B5FB C59D 614F 6F4A E348
--nextPart3112651.RpVyd9PVSf
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part.
Content-Transfer-Encoding: 7Bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQEcBAABAgAGBQJTS7KuAAoJEMWdYU9vSuNIT84IAJ4ltz14cJdwIo2ZguDTAByC
VwCrE01xd6Cu12OENC1fWoSB4WVP6XAN/iOuyXr/vW7bwK0issG1jvMPEujRtdFx
t+98sYgF4t4OocTpXY5N3mIOrcwxL2PzjzrE3cCc2QPgwmvQ27oPr3yldsfIBe1s
/laxycFDKiwnOerYinPtJ66VY8L1RCcn06PH7Sy9MaaRCtLbtzxV4cF+QtCn1OyS
jjD5Zbo+oM0JrLink8zxpMF5EyOtGJsMej6qcU+Hq0n7C6zeEOQwirgm4uh70wz7
a03vZClHvvWxPOBY03PkA/fdWLSEmNsHI2dCOfYWz3npnrYb2ulbLRa9bnh3k8s=
=1RQF
-----END PGP SIGNATURE-----

--nextPart3112651.RpVyd9PVSf--


--===============5209764139245787760==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/
--===============5209764139245787760==--