Lukas Eder 9f937fd944 Merge branch 'master' of git@github.com:jOOQ/jOOQ.git ... Conflicts: jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml jOOQ-test/src/org/jooq/test/H2Test.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/Public.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/F1256.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/F317.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays1.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays2.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays3.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FAuthorExists.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FGetOneCursor.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FNumber.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FOne.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/PCreateAuthor.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/PCreateAuthorByName.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TArrays.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TAuthor.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TBook.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TBookStore.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TBookToBookStore.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TBooleans.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TDates.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TExoticTypes.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TIdentity.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TIdentityPk.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TLanguage.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TTriggers.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/TUnsigned.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/T_2327UkOnly.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/T_639NumbersTable.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/T_725LobTest.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/T_785.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/T_877.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/VAuthor.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/VBook.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/VLibrary.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/V_2603.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/XTestCase_2025.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/XTestCase_64_69.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/XTestCase_71.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/XTestCase_85.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/XUnused.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/daos/TBookDao.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/daos/TBookStoreDao.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/interfaces/ITBook.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/interfaces/ITBookStore.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/interfaces/ITBookToBookStore.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/interfaces/IVBook.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/pojos/TBook.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/pojos/TBookStore.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/pojos/TBookToBookStore.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/pojos/VBook.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/pojos/VLibrary.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TBookRecord.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TBookStoreRecord.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/TBookToBookStoreRecord.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/VBookRecord.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/VLibraryRecord.java jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/Ää.java		2013-09-23 11:09:29 +02:00
..
.settings	Ignore unreliable Eclipse resource leaks warnings	2013-06-30 13:18:57 +02:00
src/main	Merge branch 'master' of git@github.com:jOOQ/jOOQ.git	2013-09-23 11:09:29 +02:00
.classpath	Upgraded .classpath JRE reference from 1.6 to 1.7	2012-12-28 14:49:06 +01:00
.gitignore
.project	Some auto-generated preference / settings changes	2012-12-01 17:01:49 +01:00
LICENSE.txt	Settle for final multi-licensing model: ASL 2.0 / Commercial	2013-09-17 12:01:08 +02:00
pom.xml	Renamed [com] to [pro]	2013-09-18 13:19:23 +02:00