User: sdboyer Branch: HEAD Date: Fri, 21 Nov 2008 00:05:49 +0000 Modified files: /modules/panels/arguments nid.inc node_add.inc node_edit.inc term.inc uid.inc vid.inc /modules/panels/content_types custom.inc custom_php.inc form.inc node_attachments.inc node_book_nav.inc node_comment_form.inc node_comments.inc node_content.inc node_form.inc node_type_desc.inc profile_fields.inc profile_fields_pane.tpl.php term_description.inc term_list.inc user_picture.inc user_profile.inc vocabulary_terms.inc /modules/panels/contexts node.inc node_edit_form.inc term.inc /modules/panels/css panels_dnd.css /modules/panels/includes ajax.inc common-context.inc common.inc delegator.inc display-edit.inc display-layout-settings.inc display-layout.inc display-render.inc plugins.inc /modules/panels/layouts/flexible flexible.inc /modules/panels panels.install panels.module /modules/panels/panels_mini panels_mini.admin.inc panels_mini.module /modules/panels/panels_node panels_node.module /modules/panels/panels_node_content panels_node_content.module /modules/panels/panels_page panels_page.admin.inc panels_page.css_filter.inc panels_page.menu.inc panels_page.module panels_page.read.inc panels_page.render.inc panels_page.write.inc /modules/panels/panels_views panels_plugin_display_panel_pane.inc panels_views.module panels_views.views.inc /modules/panels/plugins/task_handlers panel_node_view.inc /modules/panels/styles list.inc rounded_corners.inc /modules/panels/translations de.po panels.pot Log message: Merging DRUPAL-6--2 back into HEAD before branching to DRUPAL-6--3. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/panels/arguments/n... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/arguments/n... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/arguments/n... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/arguments/t... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/arguments/u... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/arguments/v... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/content_typ... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/contexts/no... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/contexts/no... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/contexts/te... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/css/panels_... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/aj... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/co... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/co... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/de... 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/di... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/includes/pl... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/layouts/fle... 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_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/panels_page... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_page... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_page... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_page... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_page... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_page... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_page... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_view... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_view... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/panels_view... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/plugins/tas... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/styles/list... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/styles/roun... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/translation... http://cvs.drupal.org/diff.php?path=contributions/modules/panels/translation...