Diffusion baloo e515d4230a72

Merge branch 'kolab/integration/4.13.0' into kolab/integration/4.14.3
e515d4230a72Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Publishing Disabled: All publishing is disabled for this repository.

Description

Merge branch 'kolab/integration/4.13.0' into kolab/integration/4.14.3

Conflicts:
src/pim/akonadiplugin/searchplugin.cpp
src/xapian/xapiandatabase.cpp

Details

Provenance

Christian Mollekopf <chrigi_1@fastmail.fm>

Authored on

Parents

rKBe4ddeb67bc82: build
rKB1743c09234fe: Merge branch 'kolab/integration/4.13.0' of https://github.com/kolab…

Branches

Unknown

Tags

Unknown

Event Timeline

mollekopf committed rKBe515d4230a72: Merge branch 'kolab/integration/4.13.0' into kolab/integration/4.14.3 (authored by mollekopf).Feb 1 2015, 10:38 PM

Merged Changes

1743c09234fe Merge branch 'kolab/integration/4.13.0' of https://github.com/kolab…
Author
Till Adam <adam@kde.org>
Browse Repository
No Builds
No Audits
d000735d2bf1 Exclude test on Windows, can't figure out the linking errors, atm.
Author
Till Adam <adam@kde.org>
Browse Repository
No Builds
No Audits
8052b53d6628 Avoid name clash (at least on MSVC).
Author
Till Adam <adam@kde.org>
Browse Repository
No Builds
No Audits
5d23de5827c0 Use sleep instead of usleep, which is more portable and more appropriate here…
Author
Till Adam <adam@kde.org>
Browse Repository
No Builds
No Audits
9a634a7210ad Don't print the full query on every search, less debug noise.
Author
Christian Mollekopf <chrigi_1@fastmail.fm>
Browse Repository
No Builds
No Audits
b021ae50873e Fix commit contact. Now when we change contact value we commit it.
Author
mlaurent
Browse Repository
No Builds
No Audits
a0002ff03d06 EmailSearchStore: Lock the mutex before accessing the db
Author
Vishesh Handa <me@vhanda.in>
Browse Repository
No Builds
No Audits

Changes (5)

Path

Size

src/

file/

autotest/

fileindexingjob/

pim/

agent/

autotests/

akonadiplugin/

searchplugin.cpp

xapian/

xapiandatabase.cpp

rKBe515d4230a72

src/file/autotest/fileindexingjob/extractor.cpp

Loading...

src/pim/agent/autotests/CMakeLists.txt

Loading...

src/pim/agent/index.cpp

Loading...

src/pim/akonadiplugin/searchplugin.cpp

Loading...

src/xapian/xapiandatabase.cpp

Loading...