From kde-i18n-doc  Tue Apr 14 15:13:58 2015
From: Aleix Pol <aleixpol () kde ! org>
Date: Tue, 14 Apr 2015 15:13:58 +0000
To: kde-i18n-doc
Subject: [kamoso] /: Merge branch 'frameworks'
Message-Id: <E1Yi2XG-0003Xb-Vn () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-i18n-doc&m=142904709620362

Git commit d43e632b02a825a25b632d828785638c2b0a3ee3 by Aleix Pol.
Committed on 14/04/2015 at 15:08.
Pushed by apol into branch 'master'.

Merge branch 'frameworks'

Now master is Qt5-based.

CCMAIL: kde-i18n-doc@kde.org


http://commits.kde.org/kamoso/d43e632b02a825a25b632d828785638c2b0a3ee3