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

List:       kde-commits
Subject:    [baloo] /: Merge branch 'Plasma/5.1'
From:       Dominik Cermak <d.cermak () arcor ! de>
Date:       2014-10-15 12:06:16
Message-ID: E1XeNLM-0001a8-Pz () scm ! kde ! org
[Download RAW message or body]

Git commit 43e6b26b31c08e66e0159aaaf513ab79c283d8a2 by Dominik Cermak.
Committed on 15/10/2014 at 12:03.
Pushed by cermak into branch 'master'.

Merge branch 'Plasma/5.1'

Conflicts:
	CMakeLists.txt
	src/file/kcm/kcm_baloofile.desktop
	src/kioslaves/kded/baloosearchfolderupdater.desktop


http://commits.kde.org/baloo/43e6b26b31c08e66e0159aaaf513ab79c283d8a2
[prev in list] [next in list] [prev in thread] [next in thread]