Fixes: Issues arising from rebase with master
authorJens Georg <jensg@openismus.com>
Mon, 24 Jan 2011 17:50:10 +0000 (18:50 +0100)
committerJens Georg <jensg@openismus.com>
Mon, 24 Jan 2011 21:06:45 +0000 (22:06 +0100)
commit095d7203ce5afd6dc78800a7a714ab26a421df5b
tree36bc6c08170793870704bcf580c19c6bded5a05b
parent33056f5154fb8e14f707147ad7d019936ed1d39b
Fixes: Issues arising from rebase with master

RevBy: TrustMe
15 files changed:
src/engine/abstractrequest.cpp
src/engine/abstractrequest.h
src/engine/contactcopyandremoverequest.cpp
src/engine/contactcopyandremoverequest.h
src/engine/contactfetchrequest.cpp
src/engine/contactidfetchrequest.cpp
src/engine/contactidfetchrequest.h
src/engine/contactremoverequest.cpp
src/engine/contactremoverequest.h
src/engine/contactunmergerequest.cpp
src/engine/contactunmergerequest.h
src/engine/relationshipfetchrequest.cpp
src/engine/relationshipfetchrequest.h
src/engine/relationshipsaverequest.cpp
src/engine/relationshipsaverequest.h