[hibernate-commits] [hibernate/hibernate-orm] 5a7ed7: HHH-4150 - Fix and test

Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: 5a7ed73b1ce0fdad22b84f8881ccc6aadccd2147 https://github.com/hibernate/hibernate-orm/commit/5a7ed73b1ce0fdad22b84f8... Author: Lukasz Antoniak <lukasz.antoniak(a)gmail.com&gt; Date: 2013-02-19 (Tue, 19 Feb 2013) Changed paths: M hibernate-core/src/main/antlr/hql.g M hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java Log Message: ----------- HHH-4150 - Fix and test Conflicts: hibernate-core/src/main/antlr/hql.g Commit: 477b239994be77b418983e891a62468db75c6a6c https://github.com/hibernate/hibernate-orm/commit/477b239994be77b418983e8... Author: Lukasz Antoniak <lukasz.antoniak(a)gmail.com&gt; Date: 2013-02-19 (Tue, 19 Feb 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/OrderByFragmentParser.java A hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Box.java A hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Item.java M hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java Log Message: ----------- HHH-7608 - Fix and test Compare: https://github.com/hibernate/hibernate-orm/compare/3a0c725cf322...477b239...