Changeset 2815

Timestamp:

09/09/10 19:12:45 (17 months ago)

Author:

mattlevine

Message:

1. Removing merge properties.

Location:

branches/5.2/www

Files:

• admin/view/vAdvertising (modified) (1 prop)
• config/coldspring.xml.cfm (modified) (1 prop)
• default/includes/display_objects/dsp_adZone.cfm (modified) (1 prop)
• requirements/mura/advertising (modified) (1 prop)
• requirements/mura/content/file/fileManager.cfc (modified) (1 prop)
• requirements/mura/extend (modified) (1 prop)
• requirements/mura/resourceBundle (modified) (1 prop)
• tasks/ads (modified) (1 prop)