Mercurial > ecos
diff doc/sgml/user-guide/pix/Conflicts.gif @ 208:e0c0827131d1 ecos
Merge from eCos master repository on 2002-05-20-20:11:54-BST
| author | jlarmour |
|---|---|
| date | Mon, 20 May 2002 22:19:26 +0000 |
| parents | |
| children |
line wrap: on
line diff
new file mode 100644 index 0000000000000000000000000000000000000000..c16281faa6e1b7c96dfca38f35bd3bcbdc02652e GIT binary patch literal 8067 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 AzyJUM
