# HG changeset patch
# User andy simpson <andrews@symbian.org>
# Date 1283438715 -3600
# Node ID bb3bc0aea200977e749d0926ea4e3d299e091601
# Parent  160f5df4c0e6bc659bcf17da785976f45d2d34f6# Parent  d59c248c9d360e8367b4cd6d4c8921367ee4d2f9
Merge after removal of incorrect RCL_3 drop

diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintEngine/DeviceProtocols/btprotocol/src/cbtobjectserver.cpp
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintEngine/DeviceProtocols/btprotocol/src/cbtprintingdevice.cpp
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintEngine/DeviceProtocols/rom/deviceprotocols.iby
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintEngine/DeviceProtocols/upnpprotocolfw2/src/cupnpprintingdevice.cpp
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintEngine/DeviceProtocols/upnpprotocolfw2/src/cupprintercontainer.cpp
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintEngine/ImagePrintServer/src/server/cimageprintsession.cpp
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintEngine/group/bld.inf
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintUI/imageprintapp/data/imageprintapp.rss
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintUI/imageprintapp/inc/imageprintapp.hrh
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintUI/imageprintapp/src/cimageprintappui.cpp
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintUI/imageprintapp/src/cpropertiesboxmodel.cpp
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintUI/imageprinteng/data/imageprintengine.rss
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintUI/imageprinteng/group/bld.inf
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintUI/imageprinteng/src/cdiscoverymanager.cpp
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintUI/imgpprintdll/src/cdiscoverydlgmanager.cpp
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/ImagePrintUI/imgpprintdll/src/imgpprintapputil.cpp
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/group/bld.inf
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/help/group/bld.inf
diff -r 160f5df4c0e6 -r bb3bc0aea200 ImagePrint/help/rom/imageprintuihelps_variant.iby
diff -r 160f5df4c0e6 -r bb3bc0aea200 layers.sysdef.xml