Remove leftover CVS conflict indicator lines (>>>>>>>).
Remove leftover CVS conflict indicator lines (>>>>>>>).

2000-10-15  Tor Lillqvist  <tml@iki.fi>

	* ChangeLog: Remove leftover CVS conflict indicator lines (>>>>>>>).

	* makefile.mingw: Add rules for fa, he, sp and sr.

Distrotech/gdk-pixbuf,djdeath/gdk-pixbuf,djdeath/gdk-pixbuf,djdeath/gdk-pixbuf,YueLinHo/MB3Gdk-pixbuf,YueLinHo/MB3Gdk-pixbuf,GNOME/gdk-pixbuf,GNOME/gdk-pixbuf,GNOME/gdk-pixbuf,GNOME/gdk-pixbuf,Distrotech/gdk-pixbuf,Distrotech/gdk-pixbuf,YueLinHo/MB3Gdk-pixbuf,YueLinHo/MB3Gdk-pixbuf,djdeath/gdk-pixbuf,Distrotech/gdk-pixbuf,YueLinHo/MB3Gdk-pixbuf,Distrotech/gdk-pixbuf