cmSi
Binaries
Realex - REalAuthRedirect
Binaries
Arcflex
Binaries
Roddas PDA 3.1.453
btZebra Driver
sfdc3
Cargo3
SFDC2 Binaries
Arcflex
Roddas SFDC2
Provisioning
PriProc4
solution file
Merge remote-tracking branch 'origin/master'

Conflicts:
	Clients/WinCE/Arcflex/WinCEClient.suo
	Clients/WinCE/rodas/WinCEClient.suo
	Clients/WinCE/rodas/obj/Debug/ResolveAssemblyReference.cache
	Clients/WinCE/rodas/obj/Debug/WinCEClient.exe
	Clients/WinCE/rodas/obj/Debug/WinCEClient.pdb
	Clients/ce_print/btZebra/btZebra/bin/Debug/CPCL.dll
	Clients/ce_print/btZebra/btZebra/bin/Debug/CPCL.pdb
	Clients/ce_print/btZebra/btZebra/bin/Debug/btZebra.dll
	Clients/ce_print/btZebra/btZebra/bin/Debug/btZebra.pdb
	Clients/ce_print/btZebra/btZebra/obj/Debug/ResolveAssemblyReference.cache
	Clients/ce_print/btZebra/btZebra/obj/Debug/btZebra.dll
	Clients/ce_print/btZebra/btZebra/obj/Debug/btZebra.pdb
	Clients/ce_print/btZebra/btZebra/obj/Debug/btZebra.vbproj.FileListAbsolute.txt
	Clients/ce_print/btZebra/btZebra/obj/Debug/btZebra.vbproj.GenerateResource.Cache
	Clients/ce_print/cpcl/CPCL/bin/Debug/CPCL.dll
	Clients/ce_print/cpcl/CPCL/bin/Debug/CPCL.pdb
	Clients/ce_print/cpcl/CPCL/obj/Debug/CPCL.dll
	Clients/ce_print/cpcl/CPCL/obj/Debug/CPCL.pdb
	Clients/ce_print/cpcl/CPCL/obj/Debug/CPCL.vbproj.GenerateResource.Cache
	bin/WinCE/SFDCData.dll
	bin/WinCE/SFDCData.pdb
	bin/WinCE/ceMyCls.dll
	bin/WinCE/ceMyCls.pdb
	bin/WinCE/trutex/SFDCData.dll
	bin/WinCE/trutex/SFDCData.pdb
	bin/WinCE/trutex/WinCEClient.exe
	bin/WinCE/trutex/WinCEClient.pdb
	bin/WinCE/trutex/ceLoadData.dll
	bin/WinCE/trutex/ceLoadData.pdb
	bin/WinCE/trutex/ceMyCls.dll
	bin/WinCE/trutex/ceMyCls.pdb
	components/MyCls/WinCE/obj/Debug/ceMyCls.dll
	components/MyCls/WinCE/obj/Debug/ceMyCls.pdb
	components/OnBoardData/Roddas/CtrlText.vb
	components/OnBoardData/Roddas/ctrlList.vb
	components/OnBoardData/Roddas/obj/Debug/ResolveAssemblyReference.cache
	components/OnBoardData/Roddas/obj/Debug/SFDCData.dll
	components/OnBoardData/Roddas/obj/Debug/SFDCData.pdb
	components/OnBoardData/Roddas/obj/Debug/SFDCData.vbproj.FileListAbsolute.txt
	components/OnBoardData/WinCE/obj/Debug/ResolveAssemblyReference.cache
	components/OnBoardData/WinCE/obj/Debug/SFDCData.dll
	components/OnBoardData/WinCE/obj/Debug/SFDCData.pdb
	components/OnBoardData/WinCE/obj/Debug/SFDCData.vbproj.GenerateResource.Cache
	install/Client/WinCE/arcflex/CabWiz.log
	install/Client/WinCE/arcflex/arcflexSFDC.CAB
	install/Client/WinCE/arcflex/arcflexSFDC.inf