Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-08-28 12:06:32 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-08-28 12:06:32 (GMT) |
| commit | 730b88ce48471842333b8769bcfc017335b0440f (patch) | |
| tree | 3b4c2470fb5bc250d707638520348944e46fe6cf /Swiften/LinkLocal/LinkLocalServiceInfo.h | |
| parent | 063dc0412e0f84c779f133ec7293873b76f6b2d0 (diff) | |
| parent | 33af107d8d4ffdeada9ea964fe696af4a23c5b95 (diff) | |
| download | swift-730b88ce48471842333b8769bcfc017335b0440f.zip swift-730b88ce48471842333b8769bcfc017335b0440f.tar.bz2 | |
Merge remote branch 'origin/swift-1.x'
* swift-1.x:
Catch boost file system errors when reading VCards.
Conflicts:
Swift/Controllers/Storages/VCardFileStorage.cpp
Diffstat (limited to 'Swiften/LinkLocal/LinkLocalServiceInfo.h')
0 files changed, 0 insertions, 0 deletions