Changeset 2074 for branches/locker-dev

Timestamp:

Nov 23, 2011, 4:14:00 PM (14 years ago)

Author:

andersk

Message:

Merge r2072:2073 from trunk/locker to branches/locker-dev/locker

This is effectively a noop, but contains a different conflict
resolution for the svn:mergeinfo property on locker/bin/crontab in an
attempt to restore sanity and avoid future conflicts.

Ha.

Location:

branches/locker-dev/locker

Files:

• . (modified) (1 prop)
• bin (modified) (1 prop)
• bin/crontab (modified) (1 prop)
• deploy/bin (modified) (1 prop)
• deploy/bin/django (modified) (1 prop)
• deploy/bin/rails (modified) (1 prop)
• deploy/bin/trac (modified) (1 prop)
• sql/bin/save-password (modified) (1 prop)