From f5f35a18125846d6e6ddcf4951e1838bf23a883d Mon Sep 17 00:00:00 2001 From: Mohamed Mujahid Date: Wed, 7 Jul 2010 06:36:24 +0000 Subject: merging changes from DRUPAL-6--4 --- README.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'README.txt') diff --git a/README.txt b/README.txt index ac08195..e495dd4 100644 --- a/README.txt +++ b/README.txt @@ -1,11 +1,5 @@ // $Id$ ------------ -//TODO - - -This module add the possibility to create -video nodes which are containers to embed -videos into drupal pages. to embed videos into drupal pages, using CCK and filefield support. This module add the possibility to create video nodes which are containers @@ -26,5 +20,10 @@ Maintainers ----------- Heshan Wanigasooriya :heshan at heidisoft dot com, heshanmw at gmail dot com +<<<<<<< README.txt + Dennis : http://drupal.org/user/384543 + Glen Marianko : http://drupal.org/usr/527446 http://linkedin.com/in/glenergetic twitter: @glenergetic +======= Dennis : http://drupal.org/user/384543 Glen Marianko : http://drupal.org/usr/527446 http://linkedin.com/in/glenergetic twitter: @glenergetic +>>>>>>> 1.8.4.5.4.5.2.3 -- cgit v1.2.3