diff --git a/.gitignore b/.gitignore index 6f8aa868022..6d21f732c9b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ debug-workspace/ *~ \#*\# - +# MacOSX +.DS_Store diff --git a/admin/.project b/admin/.project index c4aa4358e6c..fd600362323 100644 --- a/admin/.project +++ b/admin/.project @@ -8,4 +8,31 @@ + + + CONTRIBUTING + 1 + PARENT-1-PROJECT_LOC/CONTRIBUTING + + + pom.xml + 1 + PARENT-1-PROJECT_LOC/pom.xml + + + readme.txt + 1 + PARENT-1-PROJECT_LOC/readme.txt + + + terminals.psf + 1 + PARENT-1-PROJECT_LOC/terminals.psf + + + toplevel.gitignore + 1 + PARENT-1-PROJECT_LOC/.gitignore + + diff --git a/admin/pom-build.xml b/admin/pom-build.xml index a4750fea959..1b3f50b924e 100644 --- a/admin/pom-build.xml +++ b/admin/pom-build.xml @@ -7,13 +7,13 @@ org.eclipse.tm.terminal org.eclipse.tm.terminal.maven-config - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT pom-config.xml org.eclipse.tm.terminal org.eclipse.tm.terminal.maven-build - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT pom TM Terminal, Maven Build Master diff --git a/admin/pom-config.xml b/admin/pom-config.xml index 414f0fce7f9..440de460ba1 100644 --- a/admin/pom-config.xml +++ b/admin/pom-config.xml @@ -10,7 +10,7 @@ org.eclipse.tm.terminal org.eclipse.tm.terminal.maven-config - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT pom TM Terminal, Maven Configuration Master diff --git a/features/org.eclipse.tm.terminal.connector.local.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.local.feature/feature.properties index 2785bf502d3..811064b2727 100644 --- a/features/org.eclipse.tm.terminal.connector.local.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.connector.local.feature/feature.properties @@ -21,7 +21,7 @@ featureName=TM Terminal Local Connector Extensions providerName=Eclipse.org - Target Management # "updateSiteName" property - label for the update site -updateSiteName=TM Terminal 4.1 Updates +updateSiteName=TM Terminal 4.2 Updates # "description" property - description of the feature description=A connector implementation for the Local Terminal. diff --git a/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml index c8459f3a98e..39d7841f191 100644 --- a/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml @@ -1,6 +1,6 @@