Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2013-10-21 19:22:06 +0000
committerChristian W. Damus2013-10-21 19:22:06 +0000
commit1e3c85bc9f9514eb98628b86e9e17ec63a9a9e74 (patch)
treea13953763b839179d17d507c92b116ca6fbdac80 /plugins/org.eclipse.net4j.ui
parentf3be3bd834c62f2f8ce8944d1450e77767dbf6e5 (diff)
parent56f2473071fbb6e3eb2aebfb7eed66b3e09add08 (diff)
downloadcdo-1e3c85bc9f9514eb98628b86e9e17ec63a9a9e74.tar.gz
cdo-1e3c85bc9f9514eb98628b86e9e17ec63a9a9e74.tar.xz
cdo-1e3c85bc9f9514eb98628b86e9e17ec63a9a9e74.zip
Merge remote-tracking branch 'origin/master' into bugs/399306
Conflicts: plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java
Diffstat (limited to 'plugins/org.eclipse.net4j.ui')
0 files changed, 0 insertions, 0 deletions

Back to the top