[contributions(DRUPAL-6--2):jwolf] /themes/acquia_marina/theme_settings theme-settings-custom.php /themes/acquia_marina template.php theme-settings.php

User: jwolf Branch: DRUPAL-6--2 Date: Sat, 13 Jun 2009 10:22:57 +0000 Removed files: /themes/acquia_marina/theme_settings theme-settings-custom.php Modified files: /themes/acquia_marina template.php theme-settings.php Log message: re-structured template.php and theme-settings.php to avoid function name conflicts between tnt themes Links: http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/templ... http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/theme...