Lukas Eder b44cc4f233 Merge branch 'master' of git@github.com:jOOQ/jOOQ.git ... Conflicts: jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java jOOQ-meta/src/main/java/org/jooq/util/DefaultIdentityDefinition.java jOOQ-meta/src/main/java/org/jooq/util/IdentityDefinition.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/Keys.java jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Keys.java		2012-06-03 13:44:00 +02:00
..
org/jooq/test	Merge branch 'master' of git@github.com:jOOQ/jOOQ.git	2012-06-03 13:44:00 +02:00
log4j.xml	[#8] Add JPA annotations to generated POJOs	2012-02-11 11:39:31 +00:00