2 Commits

Author	SHA1	Message	Date
Ralf Becker	439d23490d	merged contacts_and_resources branch again with HEAD ... all further development will be in HEAD now everyone using the contacts_and_resources branch, update again to HEAD with: cvs update -dPA calendar	2005-11-08 23:15:14 +00:00
Ralf Becker	71b15ceabf	next step: conflict display (now including a freetime-search button)	2005-06-19 08:16:50 +00:00