[seam-commits] [seam/wicket] 1b016b: Merge branch 'ftest' of https://github.com/jhartin...

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/seam/wicket

Commit: 1b016ba6675f2ec549d91b5db3a921ad12b4e96a
    https://github.com/seam/wicket/commit/1b016ba6675f2ec549d91b5db3a921ad12b4e96a
Author: Shane Bryzak <sbryzak at gmail.com>
Date:   2011-02-25 (Fri, 25 Feb 2011)

Changed paths:
  A examples/numberguess/.gitignore
  M examples/numberguess/pom.xml
  M examples/numberguess/readme.txt
  M examples/numberguess/src/main/java/org/jboss/seam/wicket/example/numberguess/HomePage.html
  A examples/numberguess/src/test/java/org/jboss/seam/wicket/example/numberguess/ftest/HomePage.java
  A examples/numberguess/src/test/java/org/jboss/seam/wicket/example/numberguess/ftest/NumberGuessTest.java
  A examples/numberguess/src/test/resources/ftests.xml

Log Message:
-----------
Merge branch 'ftest' of https://github.com/jharting/seam-wicket into jharting-ftest

Conflicts:
	pom.xml