7e9b6bd5fadbd469481200f301b7537a1f33d6b4 - incubator-retired-wave

commit	7e9b6bd5fadbd469481200f301b7537a1f33d6b4	[log] [tgz]
author	Ali Lown <al@apache.org>	Tue Aug 27 19:21:36 2013 +0000
committer	Ali Lown <al@apache.org>	Tue Aug 27 19:21:36 2013 +0000
tree	13b46b4e6675a016ca6fc766cbbf1a6cf828791a
parent	5458e2d75bbd194653117c2370e58ecbfc352807 [diff]

Merge branch 'trunk-staging' into 0.4-release-staging

git-svn-id: https://svn.apache.org/repos/asf/incubator/wave/branches/wave-0.4-release@1517940 13f79535-47bb-0310-9956-ffa450edef68

src/org/waveprotocol/box/server/frontend/ClientFrontendImpl.java[diff]
src/org/waveprotocol/box/server/frontend/WaveletInfo.java[diff]
src/org/waveprotocol/box/server/waveserver/LocalWaveletContainer.java[diff]
src/org/waveprotocol/box/server/waveserver/MemoryPerUserWaveViewHandlerImpl.java[diff]
src/org/waveprotocol/box/server/waveserver/PerUserWaveViewDistpatcher.java[diff]
src/org/waveprotocol/box/server/waveserver/RemoteWaveletContainerImpl.java[diff]
src/org/waveprotocol/box/server/waveserver/SimpleSearchProviderImpl.java[diff]
src/org/waveprotocol/box/server/waveserver/Wave.java[diff]
src/org/waveprotocol/box/server/waveserver/WaveServerImpl.java[diff]
src/org/waveprotocol/box/server/waveserver/WaveletContainerImpl.java[diff]
src/org/waveprotocol/box/webclient/client/WindowTitleHandler.java[diff]
src/org/waveprotocol/box/webclient/search/WaveBasedDigest.java[diff]
src/org/waveprotocol/wave/client/StageTwo.java[diff]
src/org/waveprotocol/wave/client/wavepanel/impl/reader/Reader.java[diff]
src/org/waveprotocol/wave/model/conversation/TitleHelper.java[diff]
src/org/waveprotocol/wave/model/id/IdGenerator.java[diff]
src/org/waveprotocol/wave/model/id/IdGeneratorImpl.java[diff]
src/org/waveprotocol/wave/model/wave/opbased/WaveViewImpl.java[diff]
test/org/waveprotocol/box/server/waveserver/SimpleSearchProviderImplTest.java[diff]
test/org/waveprotocol/wave/concurrencycontrol/wave/CcBasedWaveViewTest.java[diff]

20 files changed