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 /c/src | |
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 'c/src')
0 files changed, 0 insertions, 0 deletions