Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: 3c673e573c30b2baf2689afe90cb1cb65731f3d0 https://github.com/hibernate/hibernate-orm/commit/3c673e573c30b2baf2689af... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2014-01-06 (Mon, 06 Jan 2014) Changed paths: M hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java M hibernate-core/src/main/java/org/hibernate/loader/Loader.java M hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java M hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java M hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java Log Message: ----------- HHH-3051 corrected CustomLoader returnTypes (different approach) Conflicts: hibernate-core/src/main/java/org/hibernate/loader/Loader.java hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java