User: islandusurper Branch: HEAD Date: Mon, 25 Jan 2010 16:05:36 +0000 Removed files: /modules/ubercart/ca/translations uk.po /modules/ubercart/payment/uc_credit/translations uc_credit.pot /modules/ubercart/payment/uc_cybersource HOP.php /modules/ubercart/payment/uc_cybersource/translations uc_cybersource.pot /modules/ubercart/payment/uc_payment uc_payment_payment_method.inc /modules/ubercart/payment/uc_paypal/translations uc_paypal.pot /modules/ubercart/payment/uc_recurring uc_recurring.css uc_recurring.info uc_recurring.install uc_recurring.module /modules/ubercart/shipping/uc_flatrate/translations uc_flatrate.pot /modules/ubercart/shipping/uc_quote/translations uc_quote.pot /modules/ubercart/shipping/uc_ups/translations uc_ups.pot /modules/ubercart/shipping/uc_usps/translations uc_usps.pot /modules/ubercart/translations uk-ua.po uk.po /modules/ubercart/uc_attribute/translations hu.po uc_attribute.pot uk.po /modules/ubercart/uc_cart/images cart_empty.gif cart_full.gif /modules/ubercart/uc_file/translations uc_file.pot /modules/ubercart/uc_googleanalytics/translations uc_googleanalytics.pot /modules/ubercart/uc_importer/translations uc_importer.pot /modules/ubercart/uc_notify/translations uc_notify.pot /modules/ubercart/uc_order uc_order_line_item.inc uc_order_order_pane.inc /modules/ubercart/uc_product/translations es.po uc_product.pot uk.po /modules/ubercart/uc_product uc_product.js /modules/ubercart/uc_reports/translations uc_reports.pot /modules/ubercart/uc_roles/translations uc_roles.pot /modules/ubercart/uc_stock/translations uc_stock.pot /modules/ubercart/uc_stock uc_stock_workflow.inc /modules/ubercart/uc_store/countries belgium_056_1.cif belgium_56_1.cif ireland_372_1.cif thailand_764_1.cif turkey_792_1.cif united_kingdom_826_1.cif /modules/ubercart/uc_store/includes XML2Array.php simplexml.php /modules/ubercart/uc_store/translations es.po uc_store.pot /modules/ubercart/uc_taxes/translations es.po uc_taxes.pot /modules/ubercart/uc_taxes uc_taxes.css Modified files: /modules/ubercart README.txt /modules/ubercart/docs hooks.php /modules/ubercart/payment/uc_2checkout uc_2checkout.css uc_2checkout.info uc_2checkout.install uc_2checkout.module uc_2checkout.pages.inc /modules/ubercart/payment/uc_authorizenet uc_authorizenet.admin.inc uc_authorizenet.info uc_authorizenet.install uc_authorizenet.module uc_authorizenet.pages.inc /modules/ubercart/payment/uc_payment_pack uc_payment_pack.admin.inc uc_payment_pack.info uc_payment_pack.install uc_payment_pack.module /modules/ubercart/shipping/uc_flatrate uc_flatrate.admin.inc uc_flatrate.info uc_flatrate.install uc_flatrate.module /modules/ubercart/shipping/uc_weightquote uc_weightquote.admin.inc uc_weightquote.info uc_weightquote.install uc_weightquote.module /modules/ubercart/uc_attribute uc_attribute.admin.inc uc_attribute.css uc_attribute.info uc_attribute.install /modules/ubercart/uc_catalog uc_catalog.admin.inc uc_catalog.css uc_catalog.info uc_catalog.install uc_catalog.module uc_catalog.pages.inc /modules/ubercart/uc_file uc_file.admin.inc uc_file.ca.inc uc_file.css uc_file.info uc_file.install uc_file.js uc_file.module uc_file.pages.inc /modules/ubercart/uc_order uc_order.admin.inc uc_order.ca.inc uc_order.css uc_order.info uc_order.install uc_order.js uc_order.line_item.inc uc_order.module uc_order.order_pane.inc /modules/ubercart/uc_product_kit uc_product_kit.admin.inc uc_product_kit.css uc_product_kit.info uc_product_kit.install uc_product_kit.module /modules/ubercart/uc_stock/views uc_stock.views.inc uc_stock_views_handler_filter_below_threshold.inc /modules/ubercart/uc_taxes uc_taxes.admin.inc uc_taxes.ca.inc uc_taxes.info uc_taxes.install uc_taxes.js uc_taxes.module Log message: Merge DRUPAL-6--2 back into HEAD to prepare for Ubercart 7.x-3.x. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/README.tx... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/docs/hook... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_attrib... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_attrib... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_attrib... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_attrib... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_stock/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_stock/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_taxes/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_taxes/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_taxes/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_taxes/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_taxes/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_taxes/...