[seam-commits] [seam/examples] fc2a23: changed break line character

Branch: refs/heads/master Home: https://github.com/seam/examples Commit: fc2a239adf76d38e9f903d5a5c37b12f2af26c68 https://github.com/seam/examples/commit/fc2a239adf76d38e9f903d5a5c37b12f2... Author: joserodolfofreitas <joserodolfo.freitas(a)gawab.com&gt; Date: 2011-03-26 (Sat, 26 Mar 2011) Changed paths: M booking/pom.xml M pom.xml Log Message: ----------- changed break line character Commit: d7682b9203b868c27e44afcacb548a3f37260969 https://github.com/seam/examples/commit/d7682b9203b868c27e44afcacb548a3f3... Author: Shane Bryzak <sbryzak(a)gmail.com&gt; Date: 2011-03-26 (Sat, 26 Mar 2011) Changed paths: M booking/features.txt M booking/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgent.java M booking/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistory.java M booking/src/main/java/org/jboss/seam/examples/booking/booking/ReservationDateRangeValidator.java A booking/src/main/java/org/jboss/seam/examples/booking/exceptioncontrol/ConversationExceptionHandler.java M booking/src/main/java/org/jboss/seam/examples/booking/exceptioncontrol/GeneralExceptionHandler.java R booking/src/main/java/org/jboss/seam/examples/booking/security/Authenticator.java A booking/src/main/java/org/jboss/seam/examples/booking/security/BookingAuthenticator.java R booking/src/main/java/org/jboss/seam/examples/booking/security/Credentials.java R booking/src/main/java/org/jboss/seam/examples/booking/security/Identity.java M booking/src/main/resources/META-INF/seam-beans.xml M booking/src/main/webapp/WEB-INF/pretty-config.xml M booking/src/main/webapp/WEB-INF/web.xml M booking/src/main/webapp/book.xhtml M booking/src/main/webapp/img/1-star.gif M booking/src/main/webapp/img/2-star.gif M booking/src/main/webapp/img/3-star.gif M booking/src/main/webapp/img/4-star.gif M booking/src/main/webapp/img/5-star.gif Log Message: ----------- Merge branch 'master' of https://github.com/joserodolfofreitas/examples into jose Conflicts: booking/pom.xml pom.xml Compare: https://github.com/seam/examples/compare/1a6f441...d7682b9