diff options
author | Mohamed Mujahid <muja_dd@494418.no-reply.drupal.org> | 2010-07-07 06:36:24 +0000 |
---|---|---|
committer | Mohamed Mujahid <muja_dd@494418.no-reply.drupal.org> | 2010-07-07 06:36:24 +0000 |
commit | f5f35a18125846d6e6ddcf4951e1838bf23a883d (patch) | |
tree | be23350354eb68537d107ebe171a890803c048c5 /README.txt | |
parent | 0c8e7ae689eed6291bb2061c9c75e3057b230339 (diff) | |
download | video-f5f35a18125846d6e6ddcf4951e1838bf23a883d.tar.gz video-f5f35a18125846d6e6ddcf4951e1838bf23a883d.tar.bz2 |
merging changes from DRUPAL-6--4
Diffstat (limited to 'README.txt')
-rw-r--r-- | README.txt | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -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 |