Update.

diff --git a/ChangeLog b/ChangeLog
index 2086314..d4c707f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 1998-04-23 22:43  Ulrich Drepper  <drepper@cygnus.com>
 
        * elf/dl-load.c (fillin_rpath): Handle empty element returned by

diff --git a/iconvdata/.cvsignore b/iconvdata/.cvsignore
index 8e5dcb0..ad7cfe4 100644 (file)
--- a/iconvdata/.cvsignore
+++ b/iconvdata/.cvsignore
@@ -1,7 +1,72 @@
+cp1250.h
+cp1251.h
+cp1252.h
+cp1253.h
+cp1254.h
+cp1255.h
+cp1256.h
+cp1257.h
 ebcdic-at-de-a.h
 ebcdic-at-de.h
 ebcdic-ca-fr.h
+ebcdic-dk-no-a.h
+ebcdic-dk-no.h
+ebcdic-es-a.h
+ebcdic-es-s.h
+ebcdic-es.h
+ebcdic-fi-se-a.h
+ebcdic-fi-se.h
+ebcdic-fr.h
+ebcdic-is-friss.h
+ebcdic-it.h
+ebcdic-pt.h
+ebcdic-uk.h
+ebcdic-us.h
 hp-roman8.h
+ibm037.h
+ibm038.h
+ibm1004.h
+ibm1026.h
+ibm1047.c
+ibm256.h
+ibm273.h
+ibm274.h
+ibm275.h
+ibm277.h
+ibm278.h
+ibm280.h
+ibm281.h
+ibm284.h
+ibm285.h
+ibm290.h
+ibm297.h
+ibm420.h
+ibm423.h
+ibm424.h
+ibm437.h
+ibm500.h
+ibm850.h
+ibm851.h
+ibm852.h
+ibm855.h
+ibm857.h
+ibm860.h
+ibm861.h
+ibm862.h
+ibm863.h
+ibm864.h
+ibm865.h
+ibm868.h
+ibm869.h
+ibm870.h
+ibm871.h
+ibm875.h
+ibm880.h
+ibm891.h
+ibm903.h
+ibm904.h
+ibm905.h
+ibm918.c
 iso8859-10.h
 iso8859-2.h
 iso8859-3.h