Hi Nemanja,

Thanks to you too :-)

In my opinion, you can merge the 56 commits as is.

Ga=C3=ABl

----- Mail original -----
> De: "Nemanja Hirsl" <nemhirsl@gmail.com>
> =C3=80: kde-games-devel@kde.org
> Cc: kleag@free.fr, |nemhirsl@gmail.com
> Envoy=C3=A9: Lundi 14 Ao=C3=BBt 2017 11:34:40
> Objet: Re: [ksirk] Merge frameworks branch on master ?
>=20
> =D0=94=D0=B0=D0=BD=D0=B0 =D0=BF=D0=BE=D0=BD=D0=B5=D0=B4=D0=B5=D1=99=D0=B0=
=D0=BA, 14. =D0=B0=D0=B2=D0=B3=D1=83=D1=81=D1=82 2017. =D1=83 10.51.05 CEST=
, kleag@free.fr
> =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0:
> > Hi Nimanja,
>=20
> Hi Gael, et al.
>=20
> First of all I would like to thank you all for all your effort in
> moving ksirk
> to the next level :).
> With this we have completely removed kdelibs4 from the game and
> upgraded code
> to KF5.
> =20
> > Should we merge the frameworks branch on master and finish the
> > planned work
> > on Jabber from there ?
>=20
> Definetely. I'll push the merge today, just to spend some time
> testing it. As
> of now, there are 56 commits comming from frameworks. I would merge
> them as is
> - with all the history, but if you and others prefere, I can squash
> them?
>=20
> > Regards,
> >=20
> > Ga=C3=ABl
>=20
> Best regards,
> Nemanja