david: doc/kde-client/cvs-instructions checkout_proko2.sh, 1.18, 1.19

[cvs at intevation.de]

Author: david

Update of /kolabrepository/doc/kde-client/cvs-instructions
In directory doto:/tmp/cvs-serv7867

Modified Files:
	checkout_proko2.sh 
Log Message:
Updated for Lutz' conflict resolution commit


Index: checkout_proko2.sh
===================================================================
RCS file: /kolabrepository/doc/kde-client/cvs-instructions/checkout_proko2.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- checkout_proko2.sh	14 Sep 2004 13:57:59 -0000	1.18
+++ checkout_proko2.sh	14 Sep 2004 14:59:56 -0000	1.19
@@ -9,11 +9,11 @@
 cvs up -rproko2 kmail/{Makefile.am,annotationjobs.cpp,annotationjobs.h,kmfoldercachedimap.cpp,kmfoldercachedimap.h,imapaccountbase.h,imapaccountbase.cpp}
 cvs up -rproko2 kmail/{kmail.kcfg,configuredialog.cpp,configuredialog_p.h,accountcombobox.cpp,accountcombobox.h}
 cvs up -rproko2 wizards/{Makefile.am,kolabwizard.cpp,kmailchanges.cpp}
-cvs up -rproko2 libkdepim/addresseelineedit.cpp
-cvs up -rproko2 korganizer/{freebusymanager.cpp,version.h}
+cvs up -rproko2 libkdepim/{addresseelineedit.cpp,kincidencechooser.cpp,kincidencechooser.h,kincidenceformatter.cpp,kincidenceformatter.h,Makefile.am}
+cvs up -rproko2 korganizer/{freebusymanager.cpp,version.h,actionmanager.cpp}
 cvs up -rproko2 kontact/src/main.cpp
+cvs up -rproko2 libkcal/{resourcecalendar.h,resourcecalendar.cpp}
 cvs up -rproko2 doc/{kmail,korganizer,kaddressbook}
 
 # Those are not branched anymore
 cvs up -rKDE_3_3_BRANCH korganizer/{resourceview.cpp,resourceview.h}
-cvs up -rKDE_3_3_BRANCH libkcal/resourcecalendar.h