summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-05-15 16:34:01 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-05-15 16:34:01 +0000
commit170043083949b7352f98d112875dd2060b464acb (patch)
treeb5e8ab7e411065d155450cdf13c2b6d37326d9b6 /c/src
parent2008-05-15 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-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