diff options
| author | Maria Odea B. Ching <oching@apache.org> | 2010-09-28 09:09:32 +0000 |
|---|---|---|
| committer | Maria Odea B. Ching <oching@apache.org> | 2010-09-28 09:09:32 +0000 |
| commit | e82ce0f0b50f2db74e998c02384c8f7cfa1ee4a4 (patch) | |
| tree | 039e39cc54ae6fcbfa442930a69c01e1a1825e55 /archiva-docs/src/site/resources/images | |
| parent | 9baf9de1ce12d6347588583c7011b55c32810f12 (diff) | |
| download | archiva-e82ce0f0b50f2db74e998c02384c8f7cfa1ee4a4.tar.gz archiva-e82ce0f0b50f2db74e998c02384c8f7cfa1ee4a4.zip | |
merged MRM-980 branch to trunk
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1002059 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-docs/src/site/resources/images')
| -rwxr-xr-x | archiva-docs/src/site/resources/images/conflicting-artifacts.png | bin | 0 -> 22506 bytes |
| -rwxr-xr-x | archiva-docs/src/site/resources/images/repository-merge.png | bin | 0 -> 46484 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/archiva-docs/src/site/resources/images/conflicting-artifacts.png b/archiva-docs/src/site/resources/images/conflicting-artifacts.png Binary files differnew file mode 100755 index 000000000..ac53c3a5b --- /dev/null +++ b/archiva-docs/src/site/resources/images/conflicting-artifacts.png diff --git a/archiva-docs/src/site/resources/images/repository-merge.png b/archiva-docs/src/site/resources/images/repository-merge.png Binary files differnew file mode 100755 index 000000000..3c41b80e4 --- /dev/null +++ b/archiva-docs/src/site/resources/images/repository-merge.png |
