Clone
Christian Sadilek <christian.sadilek@gmail.com>
committed
on 28 Jan 13
Merge branch 'master' into 3.0
Conflicts:
dist/pom.xml
errai-bus/demos/asyncdemo/pom.xml
errai-bus/demos/bus-stress-test/pom.xml
errai-b… Show more
Merge branch 'master' into 3.0

Conflicts:

        dist/pom.xml

        errai-bus/demos/asyncdemo/pom.xml

        errai-bus/demos/bus-stress-test/pom.xml

        errai-bus/demos/clientservice/pom.xml

        errai-bus/demos/helloworld/pom.xml

        errai-bus/demos/pom.xml

        errai-bus/demos/queryservice/pom.xml

        errai-bus/demos/rpcdemo/pom.xml

        errai-bus/demos/serialization/pom.xml

        errai-bus/demos/stockdemo/pom.xml

        errai-bus/pom.xml

        errai-cdi/demos/errai-cdi-mobile-demo/pom.xml

        errai-cdi/demos/errai-cdi-mvp-demo/pom.xml

        errai-cdi/demos/errai-cdi-stock-demo/pom.xml

        errai-cdi/demos/errai-cdi-stress-test/pom.xml

        errai-cdi/demos/errai-cdi-tagcloud-demo/pom.xml

        errai-cdi/errai-cdi-client/pom.xml

        errai-cdi/jetty/pom.xml

        errai-cdi/pom.xml

        errai-cdi/weld-integration/pom.xml

        errai-codegen-gwt/pom.xml

        errai-codegen/pom.xml

        errai-common/pom.xml

        errai-config/pom.xml

        errai-data-binding/pom.xml

        errai-html5/pom.xml

        errai-ioc/pom.xml

        errai-javaee-all/pom.xml

        errai-javax-enterprise/pom.xml

        errai-jaxrs/demos/jaxrs-demo/pom.xml

        errai-jaxrs/errai-jaxrs-client/pom.xml

        errai-jaxrs/errai-jaxrs-provider/pom.xml

        errai-jaxrs/pom.xml

        errai-jpa/demos/errai-jpa-demo-basic/pom.xml

        errai-jpa/demos/errai-jpa-demo-grocery-list/pom.xml

        errai-jpa/demos/errai-jpa-demo-todo-list/pom.xml

        errai-jpa/errai-jpa-client/pom.xml

        errai-jpa/pom.xml

        errai-js/pom.xml

        errai-marshalling/pom.xml

        errai-navigation/pom.xml

        errai-reflections/pom.xml

        errai-reflections/reflections-maven/pom.xml

        errai-reflections/reflections/pom.xml

        errai-reflections/reflections/src/test/java/org/jboss/errai/reflections/MyTestModelStore.java

        errai-tools/pom.xml

        errai-ui/pom.xml

        errai-uibinder/pom.xml

        pom.xml

        quickstart/pom.xml

        reference/pom.xml

Show less

2.4 + 20 more