Changeset 18910 for branches/camp/camp-2_5-E/data

Timestamp:

2010/11/06 10:20:24 (16 years ago)

Author:

nanasess

Message:

Merged r18888:18901

Location:

branches/camp/camp-2_5-E

Files:

• . (modified) (view diffs)
• data/Smarty/templates/admin/admin_popup_header.tpl (modified) (view diffs)
• data/Smarty/templates/admin/basis/index.tpl (modified) (view diffs)
• data/Smarty/templates/admin/contents/file_manager.tpl (modified) (view diffs)
• data/Smarty/templates/admin/contents/page_edit.tpl (deleted)
• data/Smarty/templates/admin/css/contents.tpl (modified) (view diffs)
• data/Smarty/templates/admin/customer/search_customer.tpl (modified) (view diffs)
• data/Smarty/templates/admin/design/index.tpl (modified) (view diffs)
• data/Smarty/templates/admin/login_frame.tpl (modified) (view diffs)
• data/Smarty/templates/admin/main_frame.tpl (modified) (view diffs)
• data/Smarty/templates/admin/ownersstore/index.tpl (modified) (view diffs)
• data/Smarty/templates/admin/products/category.tpl (modified) (view diffs)
• data/Smarty/templates/admin/products/confirm.tpl (modified) (view diffs)
• data/Smarty/templates/admin/products/maker.tpl (modified) (view diffs)
• data/Smarty/templates/default/campaign/active/header.tpl (modified) (view diffs)
• data/Smarty/templates/default/campaign/end/header.tpl (modified) (view diffs)
• data/Smarty/templates/default/popup_header.tpl (modified) (view diffs)
• data/Smarty/templates/default/site_main.tpl (modified) (view diffs)
• data/class/SC_View.php (modified) (view diffs)
• data/class/helper/SC_Helper_DB.php (modified) (view diffs)
• data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php (modified) (view diffs)
• data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php (modified) (view diffs)
• data/class/pages/error/LC_Page_Error_SystemError.php (modified) (view diffs)
• data/class/pages/shopping/LC_Page_Shopping_Complete.php (modified) (view diffs)