Fixes: Issues arising from rebase with master
authorJens Georg <jensg@openismus.com>
Mon, 24 Jan 2011 17:50:10 +0000 (18:50 +0100)
committerMathias Hasselmann <mathias@openismus.com>
Mon, 7 Feb 2011 16:02:40 +0000 (17:02 +0100)
commit877d85406bf6bba38d5c5ff4f15816ef42edf1cf
tree7ae170000b6eb4d9c6e9415d487a2e30e5109fc9
parent6713ae9f5a0e84ee6523df9b13cb8a2d0d294cc7
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