User: swentel Branch: DRUPAL-7--1 Date: Thu, 06 Jan 2011 12:17:18 +0000 Modified files: /modules/ds ds.fields.inc ds.registry.inc ds.view_modes.inc Log message: Clashing functions Links: http://cvs.drupal.org/diff.php?path=contributions/modules/ds/ds.fields.inc&o... http://cvs.drupal.org/diff.php?path=contributions/modules/ds/ds.registry.inc... http://cvs.drupal.org/diff.php?path=contributions/modules/ds/ds.view_modes.i...