[spip-dev] r13269 - in branches/spip-2.0/ecrire: . base maj

Dev
1

* kent1@arscenic.info tapuscrivait, le 26/11/2008 02:02:

Author: kent1@arscenic.info
Date: 2008-11-26 02:02:07 +0100 (mer, 26 nov 2008)
New Revision: 13269

Log:
report de 13268

Modified:
   branches/spip-2.0/ecrire/base/typedoc.php
   branches/spip-2.0/ecrire/inc_version.php
   branches/spip-2.0/ecrire/maj/svn10000.php

Details: http://trac.rezo.net/trac/spip/changeset/13269

Attention, il reste du code de fusion raté :
<<<<<<< .courant
    143 =======
    144 'anx'=>'application/annodex',
    145 'axa'=>'audio/annodex',
    146 'axv'=>'video/annodex',
    147 'flac' => 'audio/x-flac',
    148 >>>>>>> .fusion-droit.r13268