diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-15 16:34:01 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-15 16:34:01 +0000 |
| commit | 170043083949b7352f98d112875dd2060b464acb (patch) | |
| tree | b5e8ab7e411065d155450cdf13c2b6d37326d9b6 /testsuites/psxtests/ChangeLog | |
| parent | 2008-05-15 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-170043083949b7352f98d112875dd2060b464acb.tar.bz2 | |
2008-05-15 Joel Sherrill <joel.sherrill@oarcorp.com>
* psxstat/psxstat.scn, psxstat/test.c: Eliminate patterns that look
like CVS conflict markers.
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 |