cvs: phpdoc-ro / language-defs.ent language-snippets.ent

From: Date: Tue, 31 Jul 2007 14:08:38 +0000
Subject: cvs: phpdoc-ro / language-defs.ent language-snippets.ent
Groups: php.doc.ro 
Request: Send a blank email to doc-ro+get-255@lists.php.net to get a copy of this message
simionea Tue Jul 31 14:08:38 2007 UTC Modified files: /phpdoc-ro language-defs.ent language-snippets.ent Log: Updated the files. http://cvs.php.net/viewvc.cgi/phpdoc-ro/language-defs.ent?r1=1.15&r2=1.16&diff_format=u Index: phpdoc-ro/language-defs.ent diff -u phpdoc-ro/language-defs.ent:1.15 phpdoc-ro/language-defs.ent:1.16 --- phpdoc-ro/language-defs.ent:1.15 Tue Jul 31 14:04:43 2007 +++ phpdoc-ro/language-defs.ent Tue Jul 31 14:08:38 2007 @@ -1,5 +1,10 @@ -<!-- $Revision: 1.15 $ --> +<<<<<<< language-defs.ent +<!-- $Revision: 1.16 $ --> <!-- EN-Revision: 1.32 Maintainer: simionea Status: translated --> +======= +<!-- $Revision: 1.16 $ --> +<!-- EN-Revision: 1.32 Maintainer: simionea Status: translated --> +>>>>>>> 1.15 <!-- Part titles used mostly in manual.xml itself --> <!ENTITY PHPManual "Manualul PHP"> http://cvs.php.net/viewvc.cgi/phpdoc-ro/language-snippets.ent?r1=1.13&r2=1.14&diff_format=u Index: phpdoc-ro/language-snippets.ent diff -u phpdoc-ro/language-snippets.ent:1.13 phpdoc-ro/language-snippets.ent:1.14 --- phpdoc-ro/language-snippets.ent:1.13 Tue Jul 31 14:04:43 2007 +++ phpdoc-ro/language-snippets.ent Tue Jul 31 14:08:38 2007 @@ -1,5 +1,10 @@ -<!-- $Revision: 1.13 $ --> +<<<<<<< language-snippets.ent +<!-- $Revision: 1.14 $ --> <!-- EN-Revision: 1.207 Maintainer: simionea Status: translated --> +======= +<!-- $Revision: 1.14 $ --> +<!-- EN-Revision: 1.207 Maintainer: simionea Status: translated --> +>>>>>>> 1.13 <!-- Keep 'em sorted --> <!-- Notes -->

« previous php.doc.ro (#255) next »