[hibernate-commits] [hibernate/hibernate-orm] 55abc2: Fixed files truncated by merge from master

Branch: refs/heads/metamodel Home: https://github.com/hibernate/hibernate-orm Commit: 55abc2e35783ba7353bfe583142bc4f872d0619d https://github.com/hibernate/hibernate-orm/commit/55abc2e35783ba7353bfe58... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2012-06-08 (Fri, 08 Jun 2012) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java M hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java M hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java M hibernate-core/src/test/java/org/hibernate/test/discriminator/SimpleInheritance.hbm.xml M hibernate-core/src/test/java/org/hibernate/test/discriminator/SimpleInheritanceTest.java M hibernate-core/src/test/java/org/hibernate/test/inheritance/SimpleInheritance.hbm.xml M hibernate-core/src/test/java/org/hibernate/test/ops/SimpleEntity.hbm.xml Log Message: ----------- Fixed files truncated by merge from master