User: darrick Branch: DRUPAL-6--2 Date: Fri, 07 May 2010 19:48:39 +0000 Modified files: /modules/merci merci.info merci.module merci.views.inc merci.views_default.inc Log message: Migrated admin/merci/manage/reservations and admin/merci/manage/inventory to Calendar Views. Added views patch from issue #644268 to create views relationships for reserved items. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.info&o... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.module... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.views.... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.views_...