querydsl/querydsl-codegen
Timo Westkämper a926478d9b Merge branch 'master' into spatial
Conflicts:
	querydsl-apt/pom.xml
	querydsl-codegen/pom.xml
	querydsl-collections/pom.xml
	querydsl-core/pom.xml
	querydsl-docs/src/main/docbook/en-US/Querydsl_Reference.xml
	querydsl-hibernate-search/pom.xml
	querydsl-jdo/pom.xml
	querydsl-jpa-codegen/pom.xml
	querydsl-jpa/pom.xml
	querydsl-lucene3/pom.xml
	querydsl-lucene4/pom.xml
	querydsl-maven-plugin/pom.xml
	querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractMetaDataExportMojo.java
	querydsl-mongodb/pom.xml
	querydsl-root/pom.xml
	querydsl-scala/pom.xml
	querydsl-sql-codegen/pom.xml
	querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ant/AntMetaDataExporter.java
	querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/MetaDataSerializer.java
	querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SQLCodegenModule.java
	querydsl-sql/pom.xml
	querydsl-sql/src/main/java/com/mysema/query/sql/SQLTemplates.java
	querydsl-sql/src/main/java/com/mysema/query/sql/SQLiteTemplates.java
	querydsl-sql/src/test/java/com/mysema/query/AbstractBaseTest.java
	querydsl-sql/src/test/java/com/mysema/query/Connections.java
	querydsl-sql/src/test/java/com/mysema/query/SelectBase.java
	querydsl-sql/src/test/java/com/mysema/query/suites/H2SuiteTest.java
	querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java
	querydsl-sql/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java
	querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLSuiteTest.java
	querydsl-sql/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java
	querydsl-sql/template.mf
2014-05-13 22:25:20 +03:00
..
src Merge branch 'master' into spatial 2014-05-13 22:25:20 +03:00
pom.xml Merge branch 'master' into spatial 2014-05-13 22:25:20 +03:00
template.mf #127 replaced commons deps with Guava deps 2012-04-19 22:51:51 +03:00