Merge branch 'bugfix/resourcewatcher/reconnectOnNepomukRestart'
author Sebastian Trueg
()
committer Sebastian Trueg
()
commit febd40778ddafb35a81b6e33d9ff3df85d18ae56
tree 22ef13da9daa482b5b5127c109c570d4bd9c34a4
parent 5276018ca1c88a67ebebd14f5eb7903f084457a4
parent 5e00aa65aa817e94d02a155ee9b8973fbd3da800
Merge branch 'bugfix/resourcewatcher/reconnectOnNepomukRestart'
libnepomukcore/datamanagement/resourcewatcher.cpp
libnepomukcore/resource/resourcedata.cpp
services/storage/resourcewatchermanager.cpp
services/storage/resourcewatchermanager.h