Clone
Mike Brock <brockm@gmail.com>
committed
on 30 Aug 11
Merge branch 'master' into 1.3
Conflicts:
weld-integration/src/test/java/org/jboss/errai/cdi/event/client/test/EventObserverIntegrationTest… Show more
Merge branch 'master' into 1.3

Conflicts:

        weld-integration/src/test/java/org/jboss/errai/cdi/event/client/test/EventObserverIntegrationTest.java

        weld-integration/src/test/java/org/jboss/errai/cdi/event/client/test/EventProducerIntegrationTest.java

Show less

2.0 + 25 more