Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch '1.0'
Conflicts:
	slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/OldTest.scala
	src/main/scala/scala/slick/ast/Util.scala
	src/main/scala/scala/slick/compiler/Relational.scala
	src/main/scala/scala/slick/lifted/ColumnBase.scala
	src/main/scala/scala/slick/lifted/ExtensionMethods.scala
	src/main/scala/scala/slick/lifted/Query.scala
  • Loading branch information
szeiger committed Nov 27, 2012
2 parents c5f16b7 + f01ab66 commit f6fcd88
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit f6fcd88

Please sign in to comment.