Clone
Christian Sadilek <christian.sadilek@gmail.com>
committed
on 08 Jul 13
moved from cordova/demos to errai-demos
Conflicts:

errai-demos/errai-aerogear-demo/pom.xml
errai-demos/errai-aerogear-demo/src/main/java/… Show more
moved from cordova/demos to errai-demos

Conflicts:

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

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/App.gwt.xml

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/App.html

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/App.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/ColorPickerForm.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/ProjectForm.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/ProjectPanel.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/TagForm.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/TagsPanel.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/TaskForm.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/TaskPanel.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/authentication/AuthenticationDialogBox.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/authentication/LoginBox.html

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/authentication/LoginBox.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/authentication/RegisterBox.html

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/authentication/RegisterBox.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/css/bootstrap-responsive.min.css

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/css/bootstrap.min.css

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/css/style.css

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/events/ProjectRefreshEvent.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/events/ProjectUpdateEvent.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/events/TagRefreshEvent.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/events/TagUpdateEvent.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/events/TaskRefreshEvent.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/events/TaskUpdateEvent.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/item/AbstractItem.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/item/ProjectItem.html

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/item/ProjectItem.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/item/TagItem.html

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/item/TagItem.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/item/TaskItem.html

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/item/TaskItem.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/pipe/PipeProducer.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/pipe/Projects.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/pipe/StoreProducer.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/pipe/TagStore.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/pipe/Tags.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/pipe/Tasks.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/util/Animator.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/util/ColorConverter.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/client/local/util/DefaultCallback.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/shared/Project.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/shared/Tag.java

        errai-demos/errai-aerogear-demo/src/main/java/org/jboss/errai/example/shared/Task.java

        errai-demos/errai-aerogear-demo/src/main/resources/ErraiApp.properties

        errai-demos/errai-aerogear-demo/src/main/resources/ErraiService.properties

        errai-demos/errai-aerogear-demo/src/main/resources/log4j.properties

        errai-demos/errai-aerogear-demo/src/main/webapp/WEB-INF/web.xml

        errai-demos/errai-aerogear-demo/src/main/webapp/index.html

        errai-demos/errai-aerogear-demo/src/main/webapp/js/bootstrap.min.js

Show less

2.4 + 19 more