Merge branch 'wave-0.4-release' into master
Conflicts:
.classpath
.gitignore
.project_template
CHANGES
NOTICE
README
build.properties
build.xml
jaas.config
prosody.cfg.lua.example
proto_src/org/waveprotocol/box/attachment/AttachmentProto.java
proto_src/org/waveprotocol/box/server/persistence/protos/ProtoAccountStoreData.java
run-server.bat
server-config.xml
server.federation.config
src/com/google/gwt/build.xml
src/com/google/gwt/websockets/WebSockets.gwt.xml
src/com/google/wave/api/data/Data.gwt.xml
src/com/google/wave/api/robot/Robot.gwt.xml
src/org/waveprotocol/box/server/frontend/WaveletInfo.java
src/org/waveprotocol/box/server/persistence/protos/delta-store.proto
src/org/waveprotocol/box/server/waveserver/SimpleSearchProviderImpl.java
src/org/waveprotocol/box/server/waveserver/Wave.java
src/org/waveprotocol/box/webclient/search/i18n/SearchPresenterMessages_sl.properties
src/org/waveprotocol/box/webclient/search/i18n/SearchWidgetMessages_sl.properties
src/org/waveprotocol/box/webclient/search/mock/search.html
src/org/waveprotocol/protobuf/build.xml
src/org/waveprotocol/pst/templates/api/properties
src/org/waveprotocol/pst/templates/builder/properties
src/org/waveprotocol/pst/templates/gson/properties
src/org/waveprotocol/pst/templates/jso/properties
src/org/waveprotocol/pst/templates/pojo/properties
src/org/waveprotocol/pst/templates/proto/properties
src/org/waveprotocol/pst/templates/util/properties
src/org/waveprotocol/wave/client/build.xml
src/org/waveprotocol/wave/client/common/build.xml
src/org/waveprotocol/wave/client/scheduler/build.xml
src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/ComplexColorPicker.css
src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/SimpleColorPicker.css
src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/i18n/ColorPickerMessages_en.properties
src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/i18n/ColorPickerMessages_es.properties
src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/i18n/LinkerMessages_fr.properties
src/org/waveprotocol/wave/common/build.xml
src/org/waveprotocol/wave/communication/build.xml
src/org/waveprotocol/wave/concurrencycontrol/build.xml
src/org/waveprotocol/wave/crypto/build.xml
src/org/waveprotocol/wave/diff/build.xml
src/org/waveprotocol/wave/federation/build.xml
src/org/waveprotocol/wave/media/build.xml
src/org/waveprotocol/wave/model/build.xml
src/org/waveprotocol/wave/testing/build.xml
src/org/waveprotocol/wave/util/build.xml
src/python/api/__init__.py
src/python/api/appengine_robot_runner.py
src/python/api/blip.py
src/python/api/blip_test.py
src/python/api/commandline_robot_runner.py
src/python/api/commandline_robot_runner_test.py
src/python/api/django_oauth.py
src/python/api/element.py
src/python/api/element_test.py
src/python/api/errors.py
src/python/api/events.py
src/python/api/module_test_runner.py
src/python/api/ops.py
src/python/api/ops_test.py
src/python/api/robot.py
src/python/api/robot_test.py
src/python/api/run_unit_tests.py
src/python/api/search.py
src/python/api/search_test.py
src/python/api/testdata.py
src/python/api/util.py
src/python/api/util_test.py
src/python/api/wavelet.py
src/python/api/wavelet_test.py
src/python/api/waveservice.py
src/python/api/waveservice_test.py
test/org/waveprotocol/wave/concurrencycontrol/Tests.gwt.xml
test/org/waveprotocol/wave/model/experimental/schema/bad1.schema
test/org/waveprotocol/wave/model/experimental/schema/bad10.schema
test/org/waveprotocol/wave/model/experimental/schema/bad11.schema
test/org/waveprotocol/wave/model/experimental/schema/bad12.schema
test/org/waveprotocol/wave/model/experimental/schema/bad13.schema
test/org/waveprotocol/wave/model/experimental/schema/bad14.schema
test/org/waveprotocol/wave/model/experimental/schema/bad15.schema
test/org/waveprotocol/wave/model/experimental/schema/bad16.schema
test/org/waveprotocol/wave/model/experimental/schema/bad17.schema
test/org/waveprotocol/wave/model/experimental/schema/bad18.schema
test/org/waveprotocol/wave/model/experimental/schema/bad19.schema
test/org/waveprotocol/wave/model/experimental/schema/bad2.schema
test/org/waveprotocol/wave/model/experimental/schema/bad20.schema
test/org/waveprotocol/wave/model/experimental/schema/bad21.schema
test/org/waveprotocol/wave/model/experimental/schema/bad22.schema
test/org/waveprotocol/wave/model/experimental/schema/bad23.schema
test/org/waveprotocol/wave/model/experimental/schema/bad24.schema
test/org/waveprotocol/wave/model/experimental/schema/bad3.schema
test/org/waveprotocol/wave/model/experimental/schema/bad4.schema
test/org/waveprotocol/wave/model/experimental/schema/bad5.schema
test/org/waveprotocol/wave/model/experimental/schema/bad6.schema
test/org/waveprotocol/wave/model/experimental/schema/bad7.schema
test/org/waveprotocol/wave/model/experimental/schema/bad8.schema
test/org/waveprotocol/wave/model/experimental/schema/bad9.schema
test/org/waveprotocol/wave/model/experimental/schema/good1.schema
test/org/waveprotocol/wave/model/experimental/schema/good10.schema
test/org/waveprotocol/wave/model/experimental/schema/good11.schema
test/org/waveprotocol/wave/model/experimental/schema/good12.schema
test/org/waveprotocol/wave/model/experimental/schema/good13.schema
test/org/waveprotocol/wave/model/experimental/schema/good14.schema
test/org/waveprotocol/wave/model/experimental/schema/good15.schema
test/org/waveprotocol/wave/model/experimental/schema/good16.schema
test/org/waveprotocol/wave/model/experimental/schema/good2.schema
test/org/waveprotocol/wave/model/experimental/schema/good3.schema
test/org/waveprotocol/wave/model/experimental/schema/good4.schema
test/org/waveprotocol/wave/model/experimental/schema/good5.schema
test/org/waveprotocol/wave/model/experimental/schema/good6.schema
test/org/waveprotocol/wave/model/experimental/schema/good7.schema
test/org/waveprotocol/wave/model/experimental/schema/good8.schema
test/org/waveprotocol/wave/model/experimental/schema/good9.schema
test/org/waveprotocol/wave/model/supplement/tests.gwt.xml
test/org/waveprotocol/wave/model/tests.gwt.xml
third_party/codegen/gwt/README.google
third_party/codegen/gwt/gwt-dev.jar
third_party/codegen/gwt/gwt-user.jar
third_party/runtime/bouncycastle/LICENSE.html
third_party/runtime/gson/LICENSE
third_party/runtime/guava/README.google
third_party/runtime/jetty/README.google
third_party/runtime/libidn/LICENSE
third_party/runtime/libidn/README.google
third_party/runtime/libidn/libidn-1.26.jar
third_party/runtime/mongo-driver/README.google
third_party/runtime/protobuf/README.google
third_party/test/jmock/README.google
third_party/test/mockito/README.google
third_party/test/mockito/mockito-all-1.9.5.jar
tools/eclipse-launch/src.org.waveprotocol.wave.client.editor.examples.img.Img_Example-launch
tools/eclipse-launch/src.org.waveprotocol.wave.client.editor.harness.EditorTest-launch
war/.gitignore
