diff options
Diffstat (limited to 'testsuites/psxtests/ChangeLog')
-rw-r--r-- | testsuites/psxtests/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog index de2ea89fbe..7c9d6b9df0 100644 --- a/testsuites/psxtests/ChangeLog +++ b/testsuites/psxtests/ChangeLog @@ -1,3 +1,8 @@ +2008-05-15 Joel Sherrill <joel.sherrill@oarcorp.com> + + * psxstat/psxstat.scn, psxstat/test.c: Eliminate patterns that look + like CVS conflict markers. + 2008-04-17 Joel Sherrill <joel.sherrill@oarcorp.com> * psxchroot01/main.c, psxmount/main.c, psxreaddir/main.c: Use |