BGBM BDI Projects / cdmlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdfb03a e54977d)
merge trunk to hibernate4
authorAndreas Müller <a.mueller@bgbm.org>
Tue, 9 Apr 2013 18:15:43 +0000 (18:15 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Tue, 9 Apr 2013 18:15:43 +0000 (18:15 +0000)
1  2 
.gitattributes patch | diff1 | diff2 | blob | history
cdmlib-io/pom.xml patch | diff1 | diff2 | blob | history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBaseTest.java patch | diff1 | diff2 | blob | history

diff --cc .gitattributes
Simple merge
diff --cc cdmlib-io/pom.xml
Simple merge