[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [nepomuk-core/KDE/4.13] /: Merge remote-tracking branch 'origin/KDE/4.12' into KDE/4.13
From:       Albert Astals Cid <aacid () kde ! org>
Date:       2014-03-31 23:38:35
Message-ID: E1WUlml-0005BN-Qy () scm ! kde ! org
[Download RAW message or body]

Git commit 6babadf389f08fc824d50743bb6d12701d0abc1a by Albert Astals Cid.
Committed on 31/03/2014 at 23:38.
Pushed by aacid into branch 'KDE/4.13'.

Merge remote-tracking branch 'origin/KDE/4.12' into KDE/4.13

Conflicts:
	services/fileindexer/indexer/nepomukofficeextractor.desktop


http://commits.kde.org/nepomuk-core/6babadf389f08fc824d50743bb6d12701d0abc1a
[prev in list] [next in list] [prev in thread] [next in thread]