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
vhanda | May 12 2011, 5:53 PM |