OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web Date: 07-Jul-2003 15:55:59
Branch: HEAD Handle: 2003070714555800
Modified files:
openpkg-web news.txt
Log:
fix file
Summary:
Revision Changes Path
1.5424 +0 -6 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5423 -r1.5424 news.txt
--- openpkg-web/news.txt 7 Jul 2003 13:52:21 -0000 1.5423
+++ openpkg-web/news.txt 7 Jul 2003 13:55:58 -0000 1.5424
@@ -16,12 +16,10 @@
07-Jul-2003: Upgraded package: P<pureftpd-1.1.0-20030707>
07-Jul-2003: Upgraded package: P<prngd-0.9.27-20030707>
07-Jul-2003: Upgraded package: P<powerdns-2.9.10-20030707>
-<<<<<<< news.txt
07-Jul-2003: Upgraded package: P<portsentry-1.1-20030707>
07-Jul-2003: Upgraded package: P<portfwd-0.26rc6-20030707>
07-Jul-2003: Upgraded package: P<pks-0.9.6-20030707>
07-Jul-2003: Upgraded package: P<pinfo-0.6.7-20030707>
-<<<<<<< news.txt
07-Jul-2003: Upgraded package: P<petidomo-4.0b1-20030707>
07-Jul-2003: Upgraded package: P<openpkg-20030707-20030707>
07-Jul-2003: Upgraded package: P<ntp-4.1.1c-20030707>
@@ -40,12 +38,8 @@
07-Jul-2003: Upgraded package: P<ethereal-0.9.13-20030707>
07-Jul-2003: Upgraded package: P<cvsd-0.9.19-20030707>
07-Jul-2003: Upgraded package: P<cvs-1.12.1-20030707>
-=======
-=======
07-Jul-2003: Upgraded package: P<apache-1.3.26-1.1.5>
->>>>>>> 1.5422
07-Jul-2003: Upgraded package: P<php-4.2.2-1.1.2>
->>>>>>> 1.5421
07-Jul-2003: Upgraded package: P<txt2man-1.4.8-20030707>
07-Jul-2003: Upgraded package: P<bc-1.06-20030707>
07-Jul-2003: Upgraded package: P<audiofile-0.2.3-20030707>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
