BGBM BDI Git - cdmlib.git/commit

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/CommonServiceImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ICommonService.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyNodeServiceImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UpdateResult.java

author	Cherian Mathew <c.mathew@bgbm.org>
	Thu, 21 May 2015 15:00:13 +0000 (17:00 +0200)
committer	Cherian Mathew <c.mathew@bgbm.org>
	Thu, 21 May 2015 15:00:13 +0000 (17:00 +0200)
commit	8ee01de16538772289546991dd2f9ab93bce01d8
tree	b2aa4e8483c5b2fe8540fc8556f5744926414edc	tree \| snapshot
parent	d14dd82095bc6bc37889dbaab74204b35d287234	commit \| diff
parent	192738d610833438863b2063753aef13e84f7271	commit \| diff

.gitattributes	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembership.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/AnnotatableEntity.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTerm.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/IdentifiableMediaEntity.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/HomotypicalGroup.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationship.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationship.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationBase.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/Collection.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivedUnit.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DeterminationEvent.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/FieldUnit.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java	diff1 \|	diff2 \|	blob \| history
cdmlib-remote-webapp/ide/eclipse/RunJettyRun/cdmlib-remote-webapp - run.launch	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/CommonServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ICommonService.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyNodeServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UpdateResult.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java	diff1 \|	diff2 \|	blob \| history