Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Alexander Kuppe2010-10-26 15:24:25 -0400
committerMarkus Alexander Kuppe2010-10-26 15:24:25 -0400
commit2e0e2203403e69889d0280882245d1dc42b6d299 (patch)
treeabb8ff91dafc2189407e64df4cca6a3616545ee5
parentc863b478712c91c0d666802964dad42be7b008d9 (diff)
parent1f73367b9c6f3413154d926982608a21b7edc409 (diff)
downloadorg.eclipse.ecf-2e0e2203403e69889d0280882245d1dc42b6d299.tar.gz
org.eclipse.ecf-2e0e2203403e69889d0280882245d1dc42b6d299.tar.xz
org.eclipse.ecf-2e0e2203403e69889d0280882245d1dc42b6d299.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/ecf/org.eclipse.ecf
Conflicts: tests/bundles/org.eclipse.ecf.tests/src/org/eclipse/ecf/tests/core/identity/IDFactoryTest.java
-rw-r--r--[-rwxr-xr-x]tests/bundles/org.eclipse.ecf.tests/src/org/eclipse/ecf/tests/core/identity/IDFactoryTest.java0
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/bundles/org.eclipse.ecf.tests/src/org/eclipse/ecf/tests/core/identity/IDFactoryTest.java b/tests/bundles/org.eclipse.ecf.tests/src/org/eclipse/ecf/tests/core/identity/IDFactoryTest.java
index 58a4f4809..58a4f4809 100755..100644
--- a/tests/bundles/org.eclipse.ecf.tests/src/org/eclipse/ecf/tests/core/identity/IDFactoryTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests/src/org/eclipse/ecf/tests/core/identity/IDFactoryTest.java

Back to the top