Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Fluegge2011-10-30 08:01:15 -0400
committerMartin Fluegge2011-10-30 08:01:15 -0400
commitc733e9ad4f13af4562dc2faf692044c7ea66d760 (patch)
treed166c5f2421340f078f8e99cce5f48b37bf40b41
parentaa925465c9126616eb28040f6ea51b416487eca0 (diff)
parent06902d73741d5aa3d74bd8852041e3a3f3ddbf4f (diff)
downloadcdo-c733e9ad4f13af4562dc2faf692044c7ea66d760.tar.gz
cdo-c733e9ad4f13af4562dc2faf692044c7ea66d760.tar.xz
cdo-c733e9ad4f13af4562dc2faf692044c7ea66d760.zip
merge remote-tracking branch 'origin/master'
Conflicts: plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/DawnRuntimePlugin.java
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/client/Architecture.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/client/Architecture.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/client/Architecture.java
index 585d146bf7..72a3d1a402 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/client/Architecture.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/client/Architecture.java
@@ -30,7 +30,7 @@ public class Architecture
/**
* OSGi
* <p>
- * The Open Services Gateway Initiative...
+ * The <i>Open Services Gateway Initiative</i> (OSGi)...
*/
public class OSGi
{

Back to the top