am 135ae886: Merge change Idad5a0ab into eclair

Merge commit '135ae88641599194c398cd5dbcee535313921f7a' into eclair-mr2

* commit '135ae88641599194c398cd5dbcee535313921f7a':
  SDK: Remove STOPSHIP keyword.
This commit is contained in:
Raphael
2009-10-14 12:27:12 -07:00
committed by Android Git Automerger

View File

@@ -91,7 +91,7 @@ public class PaletteComposite extends Composite {
gl.marginBottom = 2; gl.marginBottom = 2;
setLayout(gl); setLayout(gl);
/* STOPSHIP */ /* TODO: All this is TEMPORARY. */
Label l = new Label(this, SWT.NONE); Label l = new Label(this, SWT.NONE);
l.setText("*** PLACEHOLDER ***"); //$NON-NLS-1$ l.setText("*** PLACEHOLDER ***"); //$NON-NLS-1$
l.setToolTipText("Temporary mock for the palette. Needs to scroll, needs no buttons, needs to drag'n'drop."); //$NON-NLS-1$ l.setToolTipText("Temporary mock for the palette. Needs to scroll, needs no buttons, needs to drag'n'drop."); //$NON-NLS-1$