github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:jOOQ/jOOQ.git

Browse Source 
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
This commit is contained in:
Lukas Eder 2012-06-03 13:44:00 +02:00
commit b44cc4f233
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-test/src/org/jooq/test/h2/generatedclasses/Keys.java
View File

@ -6,7 +6,7 @@ package org.jooq.test.h2.generatedclasses;
/**
* This class is generated by jOOQ.
*
* A class modelling foreign key relationships between tables of the <code>PUBLIC</code>
* A class modelling foreign key relationships between tables of the <code>PUBLIC</code>
* schema
*/
public class Keys {

2
jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Keys.java
View File

@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses;
/**
* This class is generated by jOOQ.
*
* A class modelling foreign key relationships between tables of the <code>PUBLIC</code>
* A class modelling foreign key relationships between tables of the <code>PUBLIC</code>
* schema
*/
public class Keys {