hibernate-orm/hibernate-envers
Adam Warski b109633b66 HHH-6605: Merging changes by Michal Skowronek. Thanks! Merge remote-tracking branch 'mskowron/change_info'
Conflicts:
	hibernate-envers/src/main/java/org/hibernate/envers/configuration/GlobalConfiguration.java
	hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
	hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/ComponentMetadataGenerator.java
	hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/MetadataTools.java
	hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesReader.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ComponentPropertyMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/MultiPropertyMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/PropertyMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SinglePropertyMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SubclassPropertyMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractCollectionMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversCollectionEventListener.java
	hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditProperty.java
	hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/AddWorkUnit.java
	hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java
	hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/DelWorkUnit.java
	hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/FakeBidirectionalRelationWorkUnit.java
	hibernate-envers/src/main/java/org/hibernate/envers/tools/Tools.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractOneSessionTest.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractSessionTest.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/NotAuditedManyToOneInComponent.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java
2012-01-20 20:47:12 +01:00
..
src HHH-6605: Merging changes by Michal Skowronek. Thanks! Merge remote-tracking branch 'mskowron/change_info' 2012-01-20 20:47:12 +01:00
hibernate-envers.gradle HHH-6931 - Provide local database hook 2012-01-03 20:43:15 -06:00