commit | d265a983e00f3411e62ea1cdd6addc47aaf4d299 | [log] [tgz] |
---|---|---|
author | Borislav Kapukaranov <b.kapukaranov@gmail.com> | Tue Aug 14 13:19:58 2012 +0300 |
committer | Borislav Kapukaranov <b.kapukaranov@gmail.com> | Tue Aug 14 13:19:58 2012 +0300 |
tree | 051207f2d4103087d35427af0652659a174f5e34 | |
parent | 735c5a5588ce4a2d0c9e388d30e21e0975b98d77 [diff] | |
parent | 65311c4e504703a33b0bd2e220c3b880ef7f11f7 [diff] |
Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.artifact-repository into 380765-shared-ivycache Conflicts: build.versions