| commit | 847797d0eb0acf7442c582c26abd98e508316861 | [log] [tgz] |
|---|---|---|
| author | wpiers <william.piers@obeo.fr> | Thu Sep 27 13:44:50 2012 +0200 |
| committer | wpiers <william.piers@obeo.fr> | Thu Sep 27 13:44:50 2012 +0200 |
| tree | 9a8904421323a99c1a5383184a075e95d29c8d89 | |
| parent | 6595e45d9fddf81af32e236ae387bc9f430fd4c5 [diff] | |
| parent | f8ba71728478343f50df4b22d3484f8806bc0107 [diff] |
Merge branch 'master' into emf_compare2-migration Conflicts: plugins/org.eclipse.mylyn.docs.intent.compare/src/org/eclipse/mylyn/docs/intent/compare/match/IntentMatchEngine.java plugins/org.eclipse.mylyn.docs.intent.core/model/intent_withoutcdo.genmodel tests/org.eclipse.mylyn.docs.intent.client.compiler.test/META-INF/MANIFEST.MF