User: soxofaan Branch: DRUPAL-5--2 Date: Thu, 31 Jan 2008 09:48:26 +0000 Added files: /modules/geshifilter geshifilter.conflicts.inc Modified files: /modules/geshifilter geshifilter.module Log message: refactored conflict detection and solved #185001 (code filter conflict) and #214766 (HTML escaping conflict) Links: http://cvs.drupal.org/diff.php?path=contributions/modules/geshifilter/geshif... http://cvs.drupal.org/diff.php?path=contributions/modules/geshifilter/geshif...