User: darrick Branch: DRUPAL-6--2 Date: Tue, 18 Jan 2011 03:15:09 +0000 Added files: /modules/merci/includes menu.inc /modules/merci/theme merci_conflict_grid.tpl.php merci_reservation_table.tpl.php theme.inc Modified files: /modules/merci merci.module /modules/merci/modules/merci_printable_contract merci_printable_contract.module Log message: Moved menu callbacks to include/menu.inc. Moved theme functions to theme/theme.inc. Themed merci_conflict_grid function. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/merci/includes/men... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/theme/merci_... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/theme/merci_... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/theme/theme.... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.module... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/modules/merc...