kdepim/kpilot/conduits/abbrowserconduit ResolutionDialog.ui,NONE,1.1 resolutionDialog.cc,NONE,1.1 resolutionDialog.h,NONE,1.1
Author: kainhofe

Added Files:
         ResolutionDialog.ui resolutionDialog.cc resolutionDialog.h
Log Message:
Added a resolution dialog for deconfliction