| commit | f6542de78f6bdedb1fe6f9ae57f5442dab42fe1f | [log] [tgz] |
|---|---|---|
| author | wpiers <william.piers@obeo.fr> | Wed Oct 10 17:42:22 2012 +0200 |
| committer | wpiers <william.piers@obeo.fr> | Wed Oct 10 17:42:22 2012 +0200 |
| tree | 55ec671b337778fa7fd10e5ddf2a5adabae19251 | |
| parent | 081256f329ac96cf2878c33ee7dd726e4bc2cfc2 [diff] | |
| parent | 7274d7518ac44d943c579fbeab5c5b4027a93757 [diff] |
Merge branch 'master' into cdo-integration Conflicts: plugins/org.eclipse.mylyn.docs.intent.collab.cdo/src/org/eclipse/mylyn/docs/intent/collab/cdo/repository/CDORepository.java tests/org.eclipse.mylyn.docs.intent.client.ui.test/META-INF/MANIFEST.MF tests/org.eclipse.mylyn.docs.intent.client.ui.test/src/org/eclipse/mylyn/docs/intent/client/ui/test/unit/compare/IntentMatchEngineTests.java