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

List:       kde-commits
Subject:    [konqueror] /: Merge branch 'nepomuk/resourceWatcher' of git://anongit.kde.org/kde-runtime into nepo
From:       Vishesh Handa <handa.vish () gmail ! com>
Date:       2016-11-08 12:36:01
Message-ID: E1c45dB-0002zm-8h () code ! kde ! org
[Download RAW message or body]

Git commit 2d7221ecd211dc8a37696eae26b1dc6626c07eef by Vishesh Handa.
Committed on 12/05/2011 at 17:53.
Pushed by lueck into branch 'master'.

Merge branch 'nepomuk/resourceWatcher' of git://anongit.kde.org/kde-runtime=
 into nepomuk/resourceWatcher

Conflicts:
	nepomuk/services/storage/CMakeLists.txt
	nepomuk/services/storage/repository.cpp
	nepomuk/services/storage/repository.h


http://commits.kde.org/konqueror/2d7221ecd211dc8a37696eae26b1dc6626c07eef


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