Merge.

diff --git a/ChangeLog b/ChangeLog
index 3eb2eddc59b388e7837378e2ddb0b6f3bdc00757..a826cfd57f0360689e926c87711bf8e7895a640d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-08  Andreas Jaeger  <aj@suse.de>
+
+       * sysdeps/x86_64/fpu/s_llrint.S: New.
+       * sysdeps/x86_64/fpu/s_llrintf.S: New.
+       * sysdeps/x86_64/fpu/s_llrintl.S: New.
+       * sysdeps/x86_64/fpu/s_lrint.S: New.
+       * sysdeps/x86_64/fpu/s_lrintf.S: New
+       * sysdeps/x86_64/fpu/s_lrintl.S: New.
+
 2002-04-05  Ulrich Drepper  <drepper@redhat.com>
 
        * intl/tst-gettext.sh: Set GCONV_PATH and LOCPATH to values for the