From kde-games-devel  Mon Aug 14 11:22:53 2017
From: Nemanja Hirsl <nemhirsl () gmail ! com>
Date: Mon, 14 Aug 2017 11:22:53 +0000
To: kde-games-devel
Subject: Re: [ksirk] Merge frameworks branch on master ?
Message-Id: <2919524.ol5qk7Guq4 () nhirsl-hp-elitebook-8570p>
X-MARC-Message: https://marc.info/?l=kde-games-devel&m=150270979601539
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--nextPart9759496.c7tk6IBqDP"

--nextPart9759496.c7tk6IBqDP
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="UTF-8"

=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 11.56.10 CEST=
, Luigi Toscano =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0:
> Never ever squash commits: just `git merge origin/frameworks` in master.
>=20
> You need to fix the kde-build-metadata (needed by build.kde.org) first, a=
nd
> sysadmin/repo-metadata too.
>=20
> Also, keep me in the loop as I need to move the translations.

Thanks, Luigi for pointing out these things and helping resolving them.

Ksirk master is now KF5 based and doesn't have kdelibs4 depenency anymore.
kde-build-metadata and sysadmin/repo-metada are updated too.

Best regards,
Nemanja
--nextPart9759496.c7tk6IBqDP
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

iF4EABEIAAYFAlmRiA0ACgkQ8JGzJvkqYBFB7AD/WKJKp92jbogkxf9suUJXwnuN
d573njvpJ8JeKy4SSRUBAKog5jiAaNuzmQYc2JoFand2CrD5DgxoIAfT342AUFd5
=Mvuv
-----END PGP SIGNATURE-----

--nextPart9759496.c7tk6IBqDP--