Ignore:
Timestamp:
Feb 14, 2012 4:02:30 PM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, crem3, dev, dev2, diadems, dj1.6, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, merge, sabiod, search
Children:
3afcd54
Parents:
f5ee84d (diff), adf00f3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
yomguy <yomguy@…> (14/02/2012 16:02:30)
git-committer:
yomguy <yomguy@…> (14/02/2012 16:02:30)
Message:

Merge branch 'master' into crem
fix help pages

Conflicts:

telemeta/pages/en/home.rst
telemeta/pages/fr/home.rst

File:
1 edited

Legend:

Unmodified
Added
Removed
  • telemeta/pages/en/help.rst

    r2c00b12 r721eb43  
     1.. image:: images/help.png 
     2    :align: left 
     3 
    14======================== 
    25Help pages for Telemeta 
    36======================== 
    47 
    5 Coming soon... 
     8In order to get access to some resticted items on this site, please contact: 
     9     
     10    Aude Julien <aude.da-cruz-lima (at) mae.u-paris10.fr> 
    611 
    7 Please register to our mailing list to get help now: 
     12For technical assistance, please join our mailing list: 
     13         
     14    `http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta <http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta>`_ 
     15         
     16or contact the hotline by email: 
     17             
     18     support@parisson.com 
     19             
     20or twitter : 
     21                 
     22    `http://twitter.com/telemeta <http://twitter.com/telemeta>`_ 
    823 
    9 `http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta <http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta>`_ 
    10  
    11 For more informations, see also `telemeta.org <http://telemeta.org>`_ 
     24For more informations about the Telemeta system, see `telemeta.org <http://telemeta.org>`_ 
    1225 
    1326Telemeta uses the audio librairy TimeSide : `code.google.com/p/timeside/ <http://code.google.com/p/timeside/>`_ 
Note: See TracChangeset for help on using the changeset viewer.