cvs: php-src(PHP_5_0) /pear go-pear-list.php
| From: | Jani Taskinen | Date: | Sun, 26 Jun 2005 12:24:39 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /pear go-pear-list.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32509@lists.php.net to get a copy of this message | ||
sniper Sun Jun 26 08:24:39 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/pear go-pear-list.php
Log:
revert the conflicting part
http://cvs.php.net/diff.php/php-src/pear/go-pear-list.php?r1=1.9.2.5&r2=1.9.2.6&ty=u
Index: php-src/pear/go-pear-list.php
diff -u php-src/pear/go-pear-list.php:1.9.2.5 php-src/pear/go-pear-list.php:1.9.2.6
--- php-src/pear/go-pear-list.php:1.9.2.5 Sun Jun 26 03:00:58 2005
+++ php-src/pear/go-pear-list.php Sun Jun 26 08:24:38 2005
@@ -3,18 +3,14 @@
* that will be used to create the PEAR folder
* in the windows snapshot.
* See win32/build/mkdist.php for more details
- * $Id: go-pear-list.php,v 1.9.2.5 2005/06/26 07:00:58 pajoye Exp $
+ * $Id: go-pear-list.php,v 1.9.2.6 2005/06/26 12:24:38 sniper Exp $
*/
$packages = array(
// required packages for the installer
"PEAR" => "1.3.5",
"XML_RPC" => "1.3.0",
"Console_Getopt" => "1.2",
-<<<<<<< go-pear-list.php
"Archive_Tar" => "1.3.0",
-=======
-"Archive_Tar" => "1.3.1",
->>>>>>> 1.9.2.4
// required packages for the web frontend
"PEAR_Frontend_Web" => "0.4",