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 /video.info | |
| parent | 0c8e7ae689eed6291bb2061c9c75e3057b230339 (diff) | |
| download | video-f5f35a18125846d6e6ddcf4951e1838bf23a883d.tar.gz video-f5f35a18125846d6e6ddcf4951e1838bf23a883d.tar.bz2 | |
merging changes from DRUPAL-6--4
Diffstat (limited to 'video.info')
| -rw-r--r-- | video.info | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -6,4 +6,8 @@ package = "Video" dependencies[] = content dependencies[] = filefield core = 6.x -version = 6.x-4.x-dev
\ No newline at end of file +<<<<<<< video.info +version = 6.x-4.x-dev +======= +version = 6.x-4.x-dev +>>>>>>> 1.3.4.1.4.1.2.2 |