Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.cdo.ui.compare
AgeCommit message (Expand)AuthorFilesLines
2016-10-05[Releng] Adjust per-project commit templateEike Stepper1-1/+1
2016-10-05[504014] Make merge information available in CDOCommitInfoEike Stepper2-8/+15
2016-03-01[Releng] Update copyrightsEike Stepper2-2/+2
2016-02-04[486458] Provide support for optimized loading and notifying of object units Eike Stepper1-2/+2
2015-09-15[477305] Add Interactive Transaction Conflict ResolutionEike Stepper1-15/+22
2015-09-14[477305] Add Interactive Transaction Conflict ResolutionEike Stepper1-1/+0
2015-09-13[467442] Add Interactive Transaction Conflict Resolution Eike Stepper1-5/+13
2015-09-13477128: Support interactive merging in CDOWorkspace.update() Eike Stepper2-68/+150
2015-09-11477128: Support interactive merging in CDOWorkspace.update() Eike Stepper1-0/+31
2015-09-11[Releng] Ignore version range lower bound problemsEike Stepper1-0/+4
2015-09-11[477128] Support interactive merging in CDOWorkspace.update()Eike Stepper5-29/+289
2015-06-10Update Copyrightsreleases/4.4.0Eike Stepper11-11/+11
2015-05-16[467442] Add Interactive Transaction Conflict ResolutionEike Stepper3-4/+208
2015-04-22[Releng] Reformat everything with M6 formatterEike Stepper1-9/+4
2015-03-03[458349] Consolidate UI Eike Stepper1-2/+2
2015-02-28[458349] Consolidate UI Eike Stepper1-0/+20
2015-02-28[458349] Consolidate UI Eike Stepper3-11/+20
2015-02-28[458349] Consolidate UI Eike Stepper1-6/+20
2015-02-27[458349] Consolidate UI Eike Stepper1-34/+55
2015-02-26[458349] Consolidate UI Eike Stepper1-10/+76
2015-02-25[458349] Consolidate UI Eike Stepper10-150/+258
2015-02-24[458349] Consolidate UI Eike Stepper6-33/+197
2015-01-27[Releng] Fix formatting problemsEike Stepper1-1/+1
2014-08-19Prepare baseline for 4.4 integrationEike Stepper1-2/+2
2014-03-12Fix buildEike Stepper1-2/+2
2014-01-14Fix copyrightsEike Stepper3-12/+2
2013-12-20Releng: adjust to EMF Compare Luna M4Eike Stepper2-5/+6
2013-07-27Fix deprecation warningsEike Stepper1-1/+1
2013-07-07Adjust formatter options for e4.3Eike Stepper1-1/+0
2013-05-03Update copyrightsdrops/I20130503-1515Eike Stepper12-13/+13
2013-04-05Add JavaDoc for Compare integrationEike Stepper1-0/+16
2013-03-19[402367] CommitHistoryComposite should allow to compare two historicEike Stepper6-95/+194
2013-03-19[400926] Move plugins that depends on EMF Compare to an independent andEike Stepper3-5/+134
2013-03-19[402371] CDOCompareUtil.compare fails with models that use ContainmentEike Stepper1-1/+1
2013-03-18[403661] [Legacy] Make legacy mode non-optional Eike Stepper1-3/+0
2013-03-18[402371] CDOCompareUtil.compare fails with models that use ContainmentEike Stepper1-0/+3
2013-03-16[403125] Support FeatureFilter in CDOCompareUtil Eike Stepper1-3/+2
2013-03-16[403445] [Releng] Use Execution Environments descriptions to avoidEike Stepper1-1/+2
2013-03-13[400388] Integrate the new MinimalEStoreEObjectImpl drops/I20130315-0410Eike Stepper1-1/+1
2012-12-18[396818] Add EMF Compare merge support Eike Stepper5-24/+209
2012-12-15[394629] org.eclipse.emf.cdo.ui.compare will not compile against theEike Stepper3-100/+67
2012-11-20[390808] Integrate CDO with EMF Compare Eike Stepper1-1/+1
2012-11-14Upgrade to EMF Compare 3.0Eike Stepper1-1/+1
2012-11-14Upgrade to EMF Compare 3.0Eike Stepper1-1/+1
2012-10-06[256624] [UI] Create a Commit History ViewPart Eike Stepper19-0/+942

    Back to the top