Steve Ebersole 42a3061f3e Merge branch 'master' into metamodel ... Conflicts: hibernate-core/src/main/java/org/hibernate/engine/spi/NamedQueryDefinition.java hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/AnnotationBindingContextImpl.java hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/QueryProcessor.java hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/CompositePluralAttributeElementSourceImpl.java hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/MappingDocument.java hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/TimestampAttributeSourceImpl.java hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/VersionAttributeSourceImpl.java hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EntityBindingContext.java hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/ComponentAttributeSourceImpl.java hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/Composite.java hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/BindingContext.java hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/SimpleValueBindingTests.java hibernate-entitymanager/src/main/java/org/hibernate/ejb/AvailableSettings.java hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/event/CallbackResolver.java		2012-07-19 15:50:50 -05:00
..
src	Merge branch 'master' into metamodel	2012-07-19 15:50:50 -05:00
hibernate-entitymanager.gradle	HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec + HEM boot cleanup (HHH-6159)	2012-07-18 17:48:59 -05:00