BGBM BDI Git - cdmlib.git/commit

BGBM BDI Projects / cdmlib.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d8a278e 58725c0)

author	Andreas Kohlbecker <a.kohlbecker@bgbm.org>
	Wed, 8 Feb 2012 18:56:29 +0000 (18:56 +0000)
committer	Andreas Kohlbecker <a.kohlbecker@bgbm.org>
	Wed, 8 Feb 2012 18:56:29 +0000 (18:56 +0000)
commit	315f9a96efba038dff063a97e42f0688a940328b
tree	0640a492125fd826d65fea8f86d25abb0e9fb2c1	tree \| snapshot
parent	d8a278ed601a3561d7fb347b5822731d895f3b55	commit \| diff
parent	58725c013fc8900e274dc00b71a65d20ac650cef	commit \| diff

Merging r13268 through r14040 from trunk/cdmlib into branches/cdmlib-unitils3

17 files changed:

.gitattributes	diff1 \|	diff2 \|	blob \| history
cdmlib-ext/pom.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-io/pom.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/in/SDDImportTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/pom.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/pom.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/persistence.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoHibernateImplTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoHibernateImplTest.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-remote/pom.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-services/pom.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services.xml	diff1 \|	diff2 \|	blob \| history
pom.xml	diff1 \|	diff2 \|	blob \| history