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-Nov-2003 21:25:02
Branch: HEAD Handle: 2003110720250100
Modified files:
openpkg-web news.txt
Log:
remove conflicts
Summary:
Revision Changes Path
1.7321 +1 -6 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7320 -r1.7321 news.txt
--- openpkg-web/news.txt 7 Nov 2003 20:23:28 -0000 1.7320
+++ openpkg-web/news.txt 7 Nov 2003 20:25:01 -0000 1.7321
@@ -1,3 +1,4 @@
+07-Nov-2003: Upgraded package: P<xpdf-2.03-20031107>
07-Nov-2003: Upgraded package: P<mozilla-1.5-20031107>
07-Nov-2003: Upgraded package: P<gd-2.0.15-20031107>
07-Nov-2003: Upgraded package: P<ttmkfdir-20021109-20031107>
@@ -14,12 +15,9 @@
06-Nov-2003: Upgraded package: P<snort-2.0.4-20031106>
06-Nov-2003: Upgraded package: P<whois-4.6.7-20031106>
06-Nov-2003: Upgraded package: P<netpbm-10.18.2-20031106>
-<<<<<<< news.txt
06-Nov-2003: Upgraded package: P<mutt15-1.5.5i-20031106>
-=======
06-Nov-2003: Upgraded package: P<nessus-libs-2.0.9-20031106>
06-Nov-2003: Upgraded package: P<mutt15-1.5.5i-20031106>
->>>>>>> 1.7305
06-Nov-2003: Upgraded package: P<mplayer-1.0pre2-20031106>
05-Nov-2003: Upgraded package: P<gcc34-3.4s20031105-20031105>
05-Nov-2003: Upgraded package: P<opencdk-0.5.3-20031105>
@@ -48,12 +46,9 @@
03-Nov-2003: Upgraded package: P<postgresql-7.3.4-20031103>
03-Nov-2003: Upgraded package: P<spegla-1.1p4-20031103>
03-Nov-2003: Upgraded package: P<gnutls-0.9.95-20031103>
-<<<<<<< news.txt
03-Nov-2003: Upgraded package: P<perl-tk-20031103-20031103>
-=======
03-Nov-2003: Upgraded package: P<opencdk-0.5.2-20031103>
03-Nov-2003: Upgraded package: P<perl-tk-20031103-20031103>
->>>>>>> 1.7275
03-Nov-2003: Upgraded package: P<vile-9.4b-20031103>
03-Nov-2003: Upgraded package: P<pgautodoc-1.20-20031103>
02-Nov-2003: New package: P<newsyslog-1.1-20031102>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
