OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web Date: 09-Sep-2003 15:03:08
Branch: HEAD Handle: 2003090914030600
Modified files:
openpkg-web news.txt
Log:
manual repair of fully broken news.txt file
Summary:
Revision Changes Path
1.6474 +0 -13 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6473 -r1.6474 news.txt
--- openpkg-web/news.txt 9 Sep 2003 12:52:00 -0000 1.6473
+++ openpkg-web/news.txt 9 Sep 2003 13:03:06 -0000 1.6474
@@ -1,7 +1,4 @@
09-Sep-2003: New package: P<snmpdx-0.2.1-20030909>
-<<<<<<< news.txt
-09-Sep-2003: New package: P<snmpdx-0.2.0-20030909>
-=======
09-Sep-2003: Upgraded package: P<db-4.1.25.1-20030909>
09-Sep-2003: Upgraded package: P<cvsps-2.0rc1-20030909>
09-Sep-2003: Upgraded package: P<gcc2-2.95.3-20030909>
@@ -13,7 +10,6 @@
09-Sep-2003: Upgraded package: P<binutils-2.14-20030909>
09-Sep-2003: Upgraded package: P<bind-9.2.2-20030909>
09-Sep-2003: Upgraded package: P<autogen-5.5.6-20030909>
->>>>>>> 1.6472
09-Sep-2003: Upgraded package: P<apg-2.2.2-20030909>
09-Sep-2003: Upgraded package: P<analog-5.32-20030909>
09-Sep-2003: Upgraded package: P<amd-6.0.9-20030909>
@@ -830,7 +826,6 @@
23-Jul-2003: Upgraded package: P<tetex-2.0.2-20030723>
23-Jul-2003: Upgraded package: P<smtpfeed-1.18-20030723>
23-Jul-2003: Upgraded package: P<slang-1.4.9-20030723>
-<<<<<<< news.txt
23-Jul-2003: New package: P<zyacc-1.03-20030723>
23-Jul-2003: Upgraded package: P<sav-3.56-20030723>
23-Jul-2003: Upgraded package: P<samhain-1.7.9-20030723>
@@ -839,7 +834,6 @@
23-Jul-2003: Upgraded package: P<ragel-1.5.4-20030723>
23-Jul-2003: Upgraded package: P<qt-3.1.2-20030723>
23-Jul-2003: Upgraded package: P<procmail-3.22-20030723>
-<<<<<<< news.txt
23-Jul-2003: Upgraded package: P<precc-2.51e-20030723>
23-Jul-2003: Upgraded package: P<postfix-2.0.13-20030723>
23-Jul-2003: Upgraded package: P<petidomo-4.0b1-20030723>
@@ -859,7 +853,6 @@
23-Jul-2003: Upgraded package: P<perforce-2003.1-20030723>
23-Jul-2003: Upgraded package: P<openssl-0.9.7b-20030723>
23-Jul-2003: Upgraded package: P<openpkg-20030723-20030723>
-<<<<<<< news.txt
23-Jul-2003: Upgraded package: P<openjade-1.3.2-20030723>
23-Jul-2003: Upgraded package: P<ntp-4.1.2-20030723>
23-Jul-2003: Upgraded package: P<noweb-2.10c-20030723>
@@ -910,9 +903,6 @@
23-Jul-2003: Upgraded package: P<apache-1.3.28-20030723>
23-Jul-2003: Upgraded package: P<acroread-5.07-20030723>
23-Jul-2003: Upgraded package: P<accent-0.8-20030723>
-=======
-=======
-=======
23-Jul-2003: New package: P<zyacc-1.03-20030723>
23-Jul-2003: Upgraded package: P<sav-3.56-20030723>
23-Jul-2003: Upgraded package: P<samhain-1.7.9-20030723>
@@ -990,11 +980,8 @@
23-Jul-2003: Upgraded package: P<apache-1.3.28-20030723>
23-Jul-2003: Upgraded package: P<acroread-5.07-20030723>
23-Jul-2003: Upgraded package: P<accent-0.8-20030723>
->>>>>>> 1.5751
23-Jul-2003: Upgraded package: P<tftp-0.34-20030723>
->>>>>>> 1.5749
23-Jul-2003: Upgraded package: P<qpopper-4.0.5-20030723>
->>>>>>> 1.5748
23-Jul-2003: Upgraded package: P<spamassassin-2.55-20030723>
23-Jul-2003: Upgraded package: P<portfwd-0.26rc6-20030723>
23-Jul-2003: Upgraded package: P<lmtp2nntp-1.2.0-20030723>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
