| commit | f8afeadf5019bfac609df847837351fd33397bdd | [log] [tgz] |
|---|---|---|
| author | Glyn Normington <gnormington@vmware.com> | Mon Sep 24 11:58:08 2012 +0100 |
| committer | Glyn Normington <gnormington@vmware.com> | Mon Sep 24 11:58:08 2012 +0100 |
| tree | 2dc0d7ba756276cba4f9ed5dd82a1b170106bb98 | |
| parent | 46e4ca5ebd0afc3b3f13306493d4ecef34be8d9a [diff] | |
| parent | c660a2b6e723b836bdad1232126e37733e0773a0 [diff] |
Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.artifact-repository Conflicts: org.eclipse.virgo.repository/.classpath