[CalendarServer-changes] [5153] CalendarServer/branches/users/wsanchez/m1/

[source_changes at macosforge.org]

Revision: 5153
          http://trac.macosforge.org/projects/calendarserver/changeset/5153
Author:   wsanchez at apple.com
Date:     2010-02-19 08:36:42 -0800 (Fri, 19 Feb 2010)
Log Message:
-----------
temp branch to stabilize some fixes

Added Paths:
-----------
    CalendarServer/branches/users/wsanchez/m1/


Property changes on: CalendarServer/branches/users/wsanchez/m1
___________________________________________________________________
Added: svn:ignore
   + .dependencies
*.tgz
data
logs
build
*.pyc
*.pyo
_trial_temp*
_run
.settings
.project
.pydevproject

Added: svn:mergeinfo
   + /CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
/CalendarServer/branches/users/sagen/locations-resources:5032-5051
/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/branches/users/sagen/resources-2:5084-5093
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100219/044e348d/attachment.html>