Continue with merge conflicts resolving
authorastojilj <aleksandar.stojiljkovic@nokia.com>
Tue, 13 Apr 2010 19:01:34 +0000 (22:01 +0300)
committerastojilj <aleksandar.stojiljkovic@nokia.com>
Tue, 13 Apr 2010 19:01:34 +0000 (22:01 +0300)
commit062e691006d866577463f3a6191f8ffab87a1a67
treeed24339b752dc103717227afbe92b87760669723
parent8d0f13ef86e82b11b5eddbcaf1adc04945a65f9b
Continue with merge conflicts resolving
src/qtrackercontactfetchrequest.cpp
src/qtrackercontactfetchrequest.h