Index: bfd/ChangeLog

[deliverable/binutils-gdb.git] / gas / testsuite / ChangeLog

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 0ad24bca88ad4412bea69b983cd15c0e9fb788df..61cee67c48316ed268033471fc1c840bc6515e38 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,8 +1,26 @@
+<<<<<<< ChangeLog
+2001-11-26  Geoffrey Keating  <geoffk@redhat.com>
+           matthew green  <mrg@redhat.com>
+
+       * gas/xstormy16/allinsn.d: New file.
+       * gas/xstormy16/allinsn.exp: New file.
+       * gas/xstormy16/allinsn.s: New file.
+       * gas/xstormy16/allinsn.sh: New file.
+       * gas/xstormy16/gcc.d: New file.
+       * gas/xstormy16/gcc.s: New file.
+       * gas/xstormy16/gcc.sh: New file.
+       * gas/xstormy16/reloc-1.d: New file.
+       * gas/xstormy16/reloc-1.s: New file.
+       * gas/xstormy16/reloc-2.d: New file.
+       * gas/xstormy16/reloc-2.s: New file.
+
+=======
 2001-12-08  Alan Modra  <amodra@bigpond.net.au>
 
        * gas/all/incbin.s: Add spaces before directives.
        * gas/all/incbin.d: Update.
 
+>>>>>>> 1.255
 Fri Dec  7 09:16:07 2001  Jeffrey A Law  (law@cygnus.com)
 
        * gas/hppa/parse/linesepbug.s: Restore to its original form,