User: yhahn Branch: DRUPAL-6--3 Date: Tue, 09 Feb 2010 04:38:01 +0000 Modified files: /modules/context context.install context.module /modules/context/context_ui context_ui.admin.inc /modules/context/plugins context_condition.inc context_condition_book.inc context_condition_menu.inc context_condition_node.inc context_condition_path.inc context_condition_user.inc context_condition_views.inc Log message: #650200: Introduce AND and OR condition modes. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/context/context.in... http://cvs.drupal.org/diff.php?path=contributions/modules/context/context.mo... http://cvs.drupal.org/diff.php?path=contributions/modules/context/context_ui... http://cvs.drupal.org/diff.php?path=contributions/modules/context/plugins/co... http://cvs.drupal.org/diff.php?path=contributions/modules/context/plugins/co... http://cvs.drupal.org/diff.php?path=contributions/modules/context/plugins/co... http://cvs.drupal.org/diff.php?path=contributions/modules/context/plugins/co... http://cvs.drupal.org/diff.php?path=contributions/modules/context/plugins/co... http://cvs.drupal.org/diff.php?path=contributions/modules/context/plugins/co... http://cvs.drupal.org/diff.php?path=contributions/modules/context/plugins/co...