User: soxofaan Branch: HEAD Date: Thu, 31 Jan 2008 10:30:37 +0000 Modified files: /modules/geshifilter geshifilter.admin.inc geshifilter.conflicts.inc geshifilter.module Log message: (port of http://drupal.org/cvs?commit=98566) 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... http://cvs.drupal.org/diff.php?path=contributions/modules/geshifilter/geshif...