diff options
| author | Eugene Tarassov | 2011-12-12 22:07:58 +0000 |
|---|---|---|
| committer | Eugene Tarassov | 2011-12-12 22:07:58 +0000 |
| commit | 7317d3887ded40826ca87c21ec8d6a6f87c1189f (patch) | |
| tree | f74e1cc7b92c3b097c923b02af7f934ca94e0910 | |
| parent | 8f2ea3ed7da4b5b36b8d86c2f91a46868b61ac22 (diff) | |
| parent | c7eee70576211c17992e450c6097838ac58b314a (diff) | |
| download | org.eclipse.tcf-7317d3887ded40826ca87c21ec8d6a6f87c1189f.tar.gz org.eclipse.tcf-7317d3887ded40826ca87c21ec8d6a6f87c1189f.tar.xz org.eclipse.tcf-7317d3887ded40826ca87c21ec8d6a6f87c1189f.zip | |
Merge remote branch 'remotes/origin/master' into juno-refactoring
Conflicts:
plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelProxy.java
plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestPathMap.java
pom.xml
| -rw-r--r-- | pom.xml | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -16,11 +16,11 @@ <properties> <tycho-version>0.13.0</tycho-version> - <platform-version>3.7</platform-version> + <platform-version>4.2milestones</platform-version> <platform-site>http://download.eclipse.org/eclipse/updates/${platform-version}</platform-site> <cdt-site>http://download.eclipse.org/tools/cdt/builds/hudson/cdt-nightly</cdt-site> - <tm-version>3.3</tm-version> - <tm-site>http://download.eclipse.org/tm/updates/${tm-version}</tm-site> + <tm-version>3.3</tm-version> + <tm-site>http://download.eclipse.org/tm/updates/${tm-version}</tm-site> </properties> <licenses> @@ -266,4 +266,4 @@ </plugins> </pluginManagement> </build> -</project> +</project>
\ No newline at end of file |