User: sdboyer Branch: HEAD Date: Tue, 07 Sep 2010 09:02:52 +0000 Modified files: /modules/ctools API.txt CHANGELOG.txt /modules/ctools/bulk_export bulk_export.module /modules/ctools/css ctools.css modal.css /modules/ctools ctools.install ctools.module /modules/ctools/ctools_plugin_example/plugins/access arg_length.inc example_role.inc /modules/ctools/help ctools.help.ini export.html plugins-creating.html plugins.html wizard.html /modules/ctools/includes ajax.inc cleanstring.inc content.inc content.menu.inc context-access-admin.inc context-admin.inc context-task-handler.inc context.inc context.theme.inc css.inc export.inc form.inc menu.inc modal.inc object-cache.inc plugins.inc wizard.inc /modules/ctools/js ajax-responder.js collapsible-div.js modal.js /modules/ctools/page_manager page_manager.admin.inc page_manager.install page_manager.module /modules/ctools/page_manager/plugins/tasks page.admin.inc page.inc search.inc term_view.inc user_view.inc /modules/ctools/plugins/access context_exists.inc node_language.inc perm.inc php.inc role.inc site_language.inc term_vocabulary.inc /modules/ctools/plugins/arguments term.inc /modules/ctools/plugins/content_types/block block.inc /modules/ctools/plugins/content_types/custom custom.inc /modules/ctools/plugins/content_types/node node.inc /modules/ctools/plugins/content_types/node_context node_body.inc node_comment_form.inc node_comments.inc node_content.inc node_updated.inc /modules/ctools/plugins/content_types/node_form node_form_attachments.inc node_form_author.inc node_form_book.inc node_form_buttons.inc node_form_comment.inc node_form_input_format.inc node_form_menu.inc node_form_path.inc node_form_publishing.inc node_form_taxonomy.inc /modules/ctools/plugins/content_types/page page_breadcrumb.inc page_footer_message.inc page_help.inc page_messages.inc page_mission.inc page_slogan.inc page_tabs.inc page_title.inc /modules/ctools/plugins/content_types/search search_result.inc /modules/ctools/plugins/content_types/term_context term_list.inc /modules/ctools/plugins/contexts node.inc node_add_form.inc node_edit_form.inc term.inc user.inc vocabulary.inc /modules/ctools/plugins/relationships book_parent.inc /modules/ctools/views_content/plugins/content_types views.inc views_panes.inc /modules/ctools/views_content/plugins/views views_content.views.inc views_content_plugin_display_panel_pane.inc /modules/ctools/views_content views_content.module Log message: Merging in branch 'DRUPAL-6--1', with many manual conflict resolutions. Conflicts: CHANGELOG.txt css/modal.css ctools.module ctools_plugin_example/plugins/access/arg_length.inc ctools_plugin_example/plugins/access/example_role.inc help/export.html includes/ajax.inc includes/cleanstring.inc includes/content.inc includes/content.menu.inc includes/context-task-handler.inc includes/context.inc includes/context.theme.inc includes/css.inc includes/export.inc includes/modal.inc includes/object-cache.inc includes/plugins.inc includes/wizard.inc js/ajax-responder.js js/collapsible-div.js js/dependent.js js/dimensions.js js/mc.js js/modal.js page_manager/page_manager.admin.inc page_manager/page_manager.module page_manager/plugins/tasks/page.inc page_manager/plugins/tasks/search.inc page_manager/plugins/tasks/user_view.inc plugins/access/context_exists.inc plugins/access/node_language.inc plugins/access/perm.inc plugins/access/php.inc plugins/access/role.inc plugins/access/site_language.inc plugins/access/term.inc plugins/access/term_vocabulary.inc plugins/content_types/block/block.inc plugins/content_types/custom/custom.inc plugins/content_types/node/node.inc plugins/content_types/node_context/node_comment_form.inc plugins/content_types/node_context/node_comments.inc plugins/content_types/node_context/node_content.inc plugins/content_types/page/page_breadcrumb.inc plugins/content_types/page/page_footer_message.inc plugins/content_types/page/page_help.inc plugins/content_types/page/page_messages.inc plugins/content_types/page/page_mission.inc plugins/content_types/page/page_slogan.inc plugins/content_types/page/page_tabs.inc plugins/content_types/page/page_title.inc plugins/content_types/search/search_result.inc plugins/contexts/node_edit_form.inc plugins/contexts/term.inc plugins/contexts/terms.inc plugins/contexts/user.inc plugins/relationships/book_parent.inc views_content/plugins/content_types/views.inc views_content/plugins/content_types/views_panes.inc views_content/views_content.module Links: http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/API.txt&old... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/CHANGELOG.t... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/bulk_export... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/css/ctools.... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/css/modal.c... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/ctools.inst... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/ctools.modu... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/ctools_plug... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/ctools_plug... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/help/ctools... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/help/export... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/help/plugin... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/help/plugin... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/help/wizard... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/aj... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/cl... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/co... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/co... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/co... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/co... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/co... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/co... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/co... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/cs... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/ex... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/fo... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/me... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/mo... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/ob... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/pl... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/wi... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/js/ajax-res... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/js/collapsi... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/js/modal.js... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/page_manage... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/page_manage... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/page_manage... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/page_manage... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/page_manage... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/page_manage... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/page_manage... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/page_manage... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/acc... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/acc... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/acc... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/acc... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/acc... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/acc... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/acc... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/arg... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/rel... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/views_conte... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/views_conte... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/views_conte... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/views_conte... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/views_conte...