Am Dienstag, den 21.02.2006, 10:30 +0000 schrieb Paul F. Johnson:
> Hi,
>
> > No sign of an update to owners.list by you on fedora-extras-commits
> > either. Did you commit the change?
>
> Doh!
>
> That should have it...
No -- now there are multiple lines in owners.list that shouldn't be
there. For example:
<<<<<<< owners.list
=======
>>>>>>> 1.657
Paul, please fix it.
And everyone: Please use "cvs diff -u" to look at the changes that you
are going to commit before actually committing them. tia
CU
thl
--- Begin Message ---
Author: pfj
Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27597/owners
Modified Files:
owners.list
Log Message:
owners/owners.list
Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.660
retrieving revision 1.661
diff -u -r1.660 -r1.661
--- owners.list 21 Feb 2006 07:06:32 -0000 1.660
+++ owners.list 21 Feb 2006 10:29:22 -0000 1.661
@@ -34,7 +34,7 @@
Fedora Extras|amarok|Media player for KDE|gauret@xxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|amavisd-new|Email filter with virus scanner and spamassassin support|steve@xxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|fedora-perl-devel-list@xxxxxxxxxx
Fedora Extras|amaya|W3C's browser/web authoring tool|gauret@xxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
-Fedora Extras|anjuta|GNOME IDE for C and C++|extras-orphan@xxxxxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
+Fedora Extras|anjuta|GNOME IDE for C and C++|paul@xxxxxxxxxxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|anthy|A Japanese character set input library|tagoh@xxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|antiword|MS Word to ASCII/Postscript converter|adrian@xxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|apachetop|A top-like display of Apache logs|gauret@xxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
@@ -260,9 +260,19 @@
Fedora Extras|freeze|freeze/melt/fcat compression utilities|nicolas.mailhot@xxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|frotz|Interpreter for Infocom and other Z-machine games|chris@xxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|fslint|FSlint - a utility to find and clean "lint" on a filesystem|P@xxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
+<<<<<<< owners.list
+Fedora Extras|fuse-emulator|ZX Spectrum emulator|paul@xxxxxxxxxxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
+=======
Fedora Extras|fuse|File System in Userspace|lemenkov@xxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
+>>>>>>> 1.657
Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov@xxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
+<<<<<<< owners.list
+Fedora Extras|fuse|File System in Userspace|fedora@xxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
+Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|fedora@xxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
+Fedora Extras|fuse-utils|Utilities for the Fuse-emulator package|paul@xxxxxxxxxxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
+=======
Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov@xxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
+>>>>>>> 1.657
Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla@xxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla@xxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|fyre|A tool for creating artwork from chaotic functions|ivazquez@xxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
@@ -514,6 +524,7 @@
Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez@xxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|lft|Alternate traceroute tool|ville.skytta@xxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|lib3ds|The 3D Studio File Format Library|rc040203@xxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
+Fedora Extras|lib765|765 chipset library for use with the Fuse emulator|paul@xxxxxxxxxxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|libAfterImage|A generic image manipulation library|andreas.bierfert@xxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|libannodex|Library for annotating and indexing networked media|thomas@xxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|libapreq2|Apache HTTP request library|bojan@xxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
@@ -526,6 +537,7 @@
Fedora Extras|libcmml|Library for handling Continuous Media Markup Language|thomas@xxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|libdaemon|libdaemon is a lightweight C library that eases the writing of UNIX daemons|a.kurtz@xxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|libdap|The C++ DAP2 library from OPeNDAP|pertusus@xxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
+Fedora Extras|libdsk|Disc drive library for use with the Fuse emulator|paul@xxxxxxxxxxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|oliver@xxxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|libebml|The Extensible Binary Meta Language library|anvil@xxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|libesmtp|SMTP client library|pawsa@xxxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
@@ -589,6 +601,7 @@
Fedora Extras|libsigc++|Typesafe Signal Framework for C++|denis@xxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter@xxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|libsndfile|A library for reading and writing sound files|anvil@xxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
+Fedora Extras|libspectrum|The ZX Spectrum library required for the Fuse emulator|paul@xxxxxxxxxxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|libstatgrab|Make system statistics|oliver@xxxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|libsx|Simple X library|pertusus@xxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|libtabe|Chinese lexicons library for xcin-2.5.3|llch@xxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
@@ -1468,6 +1481,7 @@
Fedora Extras|ytalk|A chat program for multiple users|imlinux@xxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|yumex|A GUI for Yum|tla@xxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|yum-utils|Utilities based around the yum package manager|skvidal@xxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
+Fedora Extras|z88dk|Z80 cross compiler|paul@xxxxxxxxxxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|zile|Zile Is Lossy Emacs|jeff@xxxxxxxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|zoo|File archiving utility with compression|nicolas.mailhot@xxxxxxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
Fedora Extras|zope|Application server in Python|gauret@xxxxxxx|extras-qa@xxxxxxxxxxxxxxxxx|
--
fedora-extras-commits mailing list
fedora-extras-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-extras-commits
--- End Message ---
--
fedora-extras-list mailing list
fedora-extras-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-extras-list
