User: ohnobinki Branch: HEAD Date: Mon, 30 Aug 2010 01:22:28 +0000 Modified files: /modules/content_lock API.txt README.txt content_lock.admin.inc content_lock.info content_lock.install content_lock.module /modules/content_lock/js content_lock_init.js jquery.url.packed.js onUserExit.js /modules/content_lock/modules/content_lock_timeout README.txt content_lock_timeout.info content_lock_timeout.module /modules/content_lock/translations content_lock.pot de.po nl.po /modules/content_lock/views content_lock.views.inc views_handler_field_is_locked.inc views_handler_filter_is_locked.inc views_handler_sort_is_locked.inc Log message: Merge DRUPAL-6--2-0 into HEAD so that HEAD actually represents the current work on content_lock. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/API.t... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/READM... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/conte... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/conte... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/conte... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/conte... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/js/co... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/js/jq... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/js/on... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/modul... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/modul... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/modul... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/trans... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/trans... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/trans... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/views... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/views... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/views... http://cvs.drupal.org/diff.php?path=contributions/modules/content_lock/views...