Merge branch 'hotfix/3.12.4' into develop
[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / strategy / merge /
2015-12-21 jenkinsMerge branch 'release/3.12.0' root/tags/cdmlib/3.12.0 3.12.0
2015-10-07 Andreas MüllerMerge branch 'develop' into ticket-5066
2015-09-28 Andreas KohlbeckerMerge branch 'master' into develop
2015-09-28 Andreas Kohlbeckerresolving conficts in project versions after hotfixrelease
2015-09-23 k.lutherminor
2015-09-10 jenkinsMerge branch 'release/3.8.0' root/tags/cdmlib/3.8.0 3.8.0
2015-09-02 Katja Lutherminor
2015-09-02 Katja Lutheradding a convertmergeStrategy because of a different...
2015-09-02 Katja Lutherchanges for tcs import, fixing taxonnodecomparator...
2015-09-02 k.lutheradding a ConvertMergeStrategy
2015-05-21 Cherian MathewMerge branch 'master' of wp5.e-taxonomy.eu:/var/git...
2015-04-01 Andreas Müllerfirst implementation of team->person->team conversion...
2015-04-01 Andreas Müllerremove onlyReallocate links as this is not yet implemen...
2015-03-31 Andreas MüllerMake deduplication of TeamOrPersonBase possible in...
2013-02-06 Andreas MüllerRemove not public classes in merge and match strategies
2010-12-01 Andreas Müllermerge 3.0.2 to trunk
2010-03-10 Katja Luthermerge cate-development2 branch with trunk
2009-09-21 Andreas MüllerIntensive model change for referenceBase and subclass...
2009-09-07 n.hoffmannchanging System.out.println to logger calls
2009-08-12 Andreas Müllermore Matching and bugfix in IdentifiableEntity.clone()
2009-08-10 Andreas Müller(no commit message)
2009-08-07 Andreas MüllerMatch framework
2009-08-06 Andreas MüllerMerging for cdmlib-model
2009-08-05 Andreas MüllerReferenceSystem terms and merge framework
2009-08-04 Andreas MüllerMedia.clone and MediaTest