merge trunk and bugfix linkbackuri jaxb
authorAndreas Müller <a.mueller@bgbm.org>
Thu, 28 Mar 2013 14:47:29 +0000 (14:47 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 28 Mar 2013 14:47:29 +0000 (14:47 +0000)
commit4794837a93289f3b8e8256f6a94577c5278ba666
treeab05c2bd02269eff2f682ccccd4296df466e8588
parent43022ea5f75d247d4dc7f1975c6c68b1d053a735
parentc27bc6863f8d21aa7f2b93405e28cfd97c377cdf
merge trunk and bugfix linkbackuri jaxb
.gitattributes
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringArea.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java
cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/AnnotationTest.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/HibernateBeanInitializer.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java
cdmlib-remote-webapp/pom.xml
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java