diff options
| author | Igor Fedorenko | 2011-08-05 05:27:31 +0000 |
|---|---|---|
| committer | Igor Fedorenko | 2011-08-05 05:27:31 +0000 |
| commit | e9906682edabd97d15907ce5e17daae20519a08d (patch) | |
| tree | 20114c863c7040c2bb6ba51bcf2a78e87dd5118b /pom.xml | |
| parent | 093352787bc8b48dfebd094d2967760491550e3e (diff) | |
| parent | 61820ff65bb40aaf98c5302942733ae244dabe7f (diff) | |
| download | m2e-core-e9906682edabd97d15907ce5e17daae20519a08d.tar.gz m2e-core-e9906682edabd97d15907ce5e17daae20519a08d.tar.xz m2e-core-e9906682edabd97d15907ce5e17daae20519a08d.zip | |
Merge remote-tracking branch 'origin/master' into m2e-self-hosting
Conflicts:
org.eclipse.m2e.integration.tests.common/.settings/org.eclipse.jdt.core.prefs
org.eclipse.m2e.integration.tests.common/pom.xml
pom.xml
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -105,7 +105,6 @@ <!-- common test helpers --> <module>org.eclipse.m2e.tests.common</module> - <module>org.eclipse.m2e.integration.tests.common</module> <!-- Logging --> <module>org.eclipse.m2e.logback.appender</module> |