User: sdboyer Branch: HEAD Date: Tue, 07 Sep 2010 09:42:13 +0000 Removed files: /modules/panels API.txt TODO.txt /modules/panels/docs docs.inc doxygen.css sample_plugin_ct.inc /modules/panels/help plugin-style.html /modules/panels panels2.doxy Modified files: /modules/panels CHANGELOG.txt D6UPDATE.txt /modules/panels/css panels-dashboard.css panels_admin.css panels_dnd.css /modules/panels/help api.html panels.help.ini plugins-layout.html plugins-style.html /modules/panels/includes callbacks.inc common.inc display-edit.inc display-layout.inc display-render.inc legacy.inc page-wizard.inc panels.pipelines.inc plugins.inc /modules/panels/js display_editor.js /modules/panels panels.install panels.module /modules/panels/panels_ipe/css panels_ipe.css /modules/panels/panels_ipe/images dragger.png /modules/panels/panels_ipe/includes panels_ipe.pipelines.inc /modules/panels/panels_ipe/js panels_ipe.js /modules/panels/panels_ipe panels_ipe.info panels_ipe.module /modules/panels/panels_ipe/plugins/display_renderers ipe.inc panels_renderer_ipe.class.php /modules/panels/panels_mini panels_mini.admin.inc panels_mini.install panels_mini.module /modules/panels/panels_mini/plugins/content_types panels_mini.inc /modules/panels/panels_mini/plugins/export_ui panels_mini.inc panels_mini_ui.class.php /modules/panels/panels_node panels_node.install panels_node.module /modules/panels/plugins/cache simple.inc /modules/panels/plugins/display_renderers editor.inc legacy.inc panels_renderer_editor.class.php panels_renderer_legacy.class.php panels_renderer_simple.class.php panels_renderer_single_pane.class.php panels_renderer_standard.class.php simple.inc single_pane.inc standard.inc /modules/panels/plugins/export_ui panels_layouts.inc panels_layouts_ui.class.php /modules/panels/plugins/layouts/flexible flexible-admin.css flexible-admin.js flexible.css flexible.inc /modules/panels/plugins/layouts/onecol onecol.inc /modules/panels/plugins/layouts/threecol_25_50_25 threecol_25_50_25.inc /modules/panels/plugins/layouts/threecol_25_50_25_stacked panels-threecol-25-50-25-stacked.tpl.php threecol_25_50_25_stacked.inc /modules/panels/plugins/layouts/threecol_33_34_33 threecol_33_34_33.inc /modules/panels/plugins/layouts/threecol_33_34_33_stacked panels-threecol-33-34-33-stacked.tpl.php /modules/panels/plugins/layouts/twocol twocol.inc /modules/panels/plugins/layouts/twocol_bricks twocol_bricks.inc /modules/panels/plugins/layouts/twocol_stacked panels-twocol-stacked.tpl.php twocol_stacked.inc /modules/panels/plugins/page_wizards landing_page.inc node_override.inc /modules/panels/plugins/style_bases/pane/pane_plain_box icon.png pane-plain-box.css pane-plain-box.tpl.php pane_plain_box.inc /modules/panels/plugins/style_bases/pane/pane_rounded_shadow box-color.png box-shadow.png icon.png pane-rounded-shadow.css pane-rounded-shadow.tpl.php pane_rounded_shadow.inc /modules/panels/plugins/style_bases/region/region_plain_box icon.png region-plain-box.css region-plain-box.tpl.php region_plain_box.inc /modules/panels/plugins/style_bases/region/region_rounded_shadow box-color.png box-shadow.png icon.png region-rounded-shadow.css region-rounded-shadow.tpl.php region_rounded_shadow.inc /modules/panels/plugins/styles block.inc naked.inc stylizer.inc /modules/panels/plugins/task_handlers panel_context.inc /modules/panels/plugins/views panels.views.inc panels_views_plugin_row_fields.inc /modules/panels/templates panels-dashboard-block.tpl.php panels-dashboard-link.tpl.php panels-dashboard.tpl.php /modules/panels/translations panels.fr.po panels.hu.po Log message: Merging DRUPAL-6--3 into HEAD for 7.x work. Some manually-resolved merge conflicts. Conflicts: contexts/terms.inc docs/sample_plugin_ct.inc help/plugin-style.html help/plugins-style.html plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.inc plugins/layouts/twocol_bricks/panels-twocol-bricks.tpl.php plugins/styles/corners/rounded_corners.inc plugins/styles/default.inc plugins/styles/list.inc Links: http://cvs.drupal.org/diff.php?path=contributions/modules/panels/CHANGELOG.t... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/D6UPDATE.tx... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/css/panels-... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/css/panels_... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/css/panels_... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/help/api.ht... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/help/panels... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/help/plugin... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/help/plugin... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/ca... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/co... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/di... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/di... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/di... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/le... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/pa... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/pa... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/pl... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/js/display_... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels.inst... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels.modu... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_ipe/... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_ipe/... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_ipe/... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_ipe/... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_ipe/... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_ipe/... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_ipe/... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_ipe/... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_mini... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_mini... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_mini... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_mini... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_mini... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_mini... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_node... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_node... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/cac... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/dis... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/dis... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/dis... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/dis... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/dis... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/dis... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/dis... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/dis... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/dis... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/dis... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/exp... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/exp... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/lay... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/pag... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/pag... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/sty... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/tas... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/vie... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/vie... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/templates/p... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/templates/p... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/templates/p... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/translation... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/translation...