Branch: refs/heads/master Home: http://github.com/pmuir/ticket-monster Commit: 5f2b30d6dcb1cf79aba32dc7632ca7ffec791bd9 http://github.com/pmuir/ticket-monster/commit/5f2b30d6dcb1cf79aba32dc7632... Author: Pete Muir <pmuir(a)bleepbleep.org.uk&gt; Date: 2010-09-13 (Mon, 13 Sep 2010) Changed paths: A core/src/main/java/META-INF/MANIFEST.MF A core/src/main/java/org/jboss/seam/example/ticketmonster/dto/Availability.java A gwt-ui/war/META-INF/MANIFEST.MF A jsf-ui/src/main/webapp/META-INF/MANIFEST.MF A jsf-ui/src/main/webapp/WEB-INF/templates/simple.xhtml A jsf-ui/src/main/webapp/WEB-INF/web.xml A jsf-ui/src/main/webapp/script/easteregg.js A jsf-ui/src/main/webapp/style/btn_next.png A jsf-ui/src/main/webapp/style/btn_previous.png A jsf-ui/src/main/webapp/style/rawr.png A jsf-ui/src/main/webapp/style/sectionheader_bg.png R src/main/java/org/jboss/seam/example/ticketmonster/dto/Availability.java R src/main/webapp/WEB-INF/templates/simple.xhtml R src/main/webapp/script/easteregg.js R src/main/webapp/style/btn_next.png R src/main/webapp/style/btn_previous.png R src/main/webapp/style/rawr.png R src/main/webapp/style/sectionheader_bg.png Log Message: ----------- Complete the merge of Shane and Heiko's changes manually